always log issue id when deploying contracts

This commit is contained in:
Martin Klepsch 2018-04-12 10:58:42 +02:00
parent ffce0828c0
commit a4463b9810
2 changed files with 15 additions and 16 deletions

View File

@ -22,24 +22,22 @@
(defn deploy-contract [owner owner-address repo issue-id issue-number] (defn deploy-contract [owner owner-address repo issue-id issue-number]
(if (empty? owner-address) (if (empty? owner-address)
(log/error "Unable to deploy bounty contract because" (log/errorf "issue %s: Unable to deploy bounty contract because repo owner has no Ethereum addres" issue-id)
"repo owner has no Ethereum addres")
(do (do
(log/info "deploying contract to " owner-address) (log/infof "issue %s: Deploying contract to %s" issue-id owner-address)
(if-let [transaction-hash (multisig/deploy-multisig owner-address)] (if-let [transaction-hash (multisig/deploy-multisig owner-address)]
(do (do
(log/info "Contract deployed, transaction-hash:" (log/infof "issue %s: Contract deployed, transaction-hash: %s" issue-id transaction-hash)
transaction-hash)
(let [resp (github/post-deploying-comment owner (let [resp (github/post-deploying-comment owner
repo repo
issue-number issue-number
transaction-hash) transaction-hash)
_ (log/info "post-deploying-comment response:" resp)
comment-id (:id resp)] comment-id (:id resp)]
(log/infof "issue %s: post-deploying-comment response: %s" issue-id resp)
(issues/update-comment-id issue-id comment-id)) (issues/update-comment-id issue-id comment-id))
(issues/update-transaction-hash issue-id transaction-hash)) (issues/update-transaction-hash issue-id transaction-hash))
(log/error "Failed to deploy contract to" owner-address))))) (log/errorf "issue %s Failed to deploy contract to %s" issue-id owner-address)))))
(defn add-bounty-for-issue [repo repo-id issue] (defn add-bounty-for-issue [repo repo-id issue]
(let [{issue-id :id (let [{issue-id :id
issue-number :number issue-number :number
@ -47,16 +45,17 @@
created-issue (issues/create repo-id issue-id issue-number issue-title) created-issue (issues/create repo-id issue-id issue-number issue-title)
{owner-address :address {owner-address :address
owner :owner} (users/get-repo-owner repo-id)] owner :owner} (users/get-repo-owner repo-id)]
(log/debug "Adding bounty for issue " repo issue-number "owner address: " owner-address) (log/debug "issue %s: Adding bounty for issue %s/%s - owner address: %s"
issue-id repo issue-number owner-address)
(if (= 1 created-issue) (if (= 1 created-issue)
(deploy-contract owner owner-address repo issue-id issue-number) (deploy-contract owner owner-address repo issue-id issue-number)
(log/debug "Issue already exists in DB, ignoring")))) (log/debug "issue %s: Issue already exists in DB, ignoring"))))
(defn maybe-add-bounty-for-issue [repo repo-id issue] (defn maybe-add-bounty-for-issue [repo repo-id issue]
(let [res (issues/get-issues-count repo-id) (let [res (issues/get-issues-count repo-id)
{count :count} res {count :count} res
limit-reached? (> count max-issues-limit) limit-reached? (> count max-issues-limit)]
_ (log/debug "*** get-issues-count" repo-id " " res " " count " " limit-reached?)] (log/debug "*** get-issues-count" repo-id " " res " " count " " limit-reached?)
(if limit-reached? (if limit-reached?
(log/debug "Total issues for repo limit reached " repo " " count) (log/debug "Total issues for repo limit reached " repo " " count)
(add-bounty-for-issue repo repo-id issue)))) (add-bounty-for-issue repo repo-id issue))))
@ -102,9 +101,7 @@
(issues/get-issue-titles)] (issues/get-issue-titles)]
(let [gh-issue (github/get-issue owner repo issue_number)] (let [gh-issue (github/get-issue owner repo issue_number)]
(if-not (= title (:title gh-issue)) (if-not (= title (:title gh-issue))
(do (issues/update-issue-title (:id gh-issue) (:title gh-issue))))))
(log/info "Updating changed title for issue" (:id gh-issue))
(issues/update-issue-title (:id gh-issue) (:title gh-issue)))))))
(defn assert-keys [m ks] (defn assert-keys [m ks]
(doseq [k ks] (doseq [k ks]

View File

@ -1,7 +1,8 @@
(ns commiteth.db.issues (ns commiteth.db.issues
(:require [commiteth.db.core :refer [*db*] :as db] (:require [commiteth.db.core :refer [*db*] :as db]
[clojure.java.jdbc :as jdbc] [clojure.java.jdbc :as jdbc]
[clojure.set :refer [rename-keys]])) [clojure.set :refer [rename-keys]]
[clojure.tools.logging :as log]))
(defn create (defn create
"Creates issue" "Creates issue"
@ -31,6 +32,7 @@
(defn update-issue-title (defn update-issue-title
[issue-id title] [issue-id title]
(log/info "issue %s: Updating changed title \"%s\"" issue-id title)
(jdbc/with-db-connection [con-db *db*] (jdbc/with-db-connection [con-db *db*]
(db/update-issue-title con-db {:issue_id issue-id (db/update-issue-title con-db {:issue_id issue-id
:title title}))) :title title})))