Merge pull request #3585 from penpot/niwinz-staging-storage-gc-deleted

 Add minor improvements to logging
This commit is contained in:
Alejandro 2023-09-01 06:40:41 +02:00 committed by GitHub
commit 56a0d522dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 19 deletions

View file

@ -23,7 +23,7 @@
<Logger name="app.rpc.commands.binfile" level="debug" /> <Logger name="app.rpc.commands.binfile" level="debug" />
<Logger name="app.storage.tmp" level="debug" /> <Logger name="app.storage.tmp" level="debug" />
<Logger name="app.worker" level="info" /> <Logger name="app.worker" level="trace" />
<Logger name="app.msgbus" level="info" /> <Logger name="app.msgbus" level="info" />
<Logger name="app.http.websocket" level="info" /> <Logger name="app.http.websocket" level="info" />
<Logger name="app.util.websocket" level="info" /> <Logger name="app.util.websocket" level="info" />

View file

@ -773,7 +773,7 @@
(defn- lookup-index (defn- lookup-index
[id] [id]
(let [val (get-in @*state* [:index id])] (let [val (get-in @*state* [:index id])]
(l/debug :fn "lookup-index" :id id :val val ::l/sync? true) (l/trc :fn "lookup-index" :id id :val val ::l/sync? true)
(when (and (not (::ignore-index-errors? *options*)) (not val)) (when (and (not (::ignore-index-errors? *options*)) (not val))
(ex/raise :type :validation (ex/raise :type :validation
:code :incomplete-index :code :incomplete-index

View file

@ -207,10 +207,10 @@
(db/create-array conn "uuid" ids)]] (db/create-array conn "uuid" ids)]]
(db/exec-one! conn sql) (db/exec-one! conn sql)
(l/debug :hist "dispatcher: queue tasks" (l/dbg :hist "dispatcher: queue tasks"
:queue queue :queue queue
:tasks (count ids) :tasks (count ids)
:queued res))) :queued res)))
(run-batch! [rconn] (run-batch! [rconn]
(try (try
@ -433,12 +433,12 @@
:else :else
(try (try
(l/debug :hint "worker: executing task" (l/dbg :hint "worker: executing task"
:name (:name task) :name (:name task)
:id (:id task) :id (str (:id task))
:queue queue :queue queue
:worker-id worker-id :worker-id worker-id
:retry (:retry-num task)) :retry (:retry-num task))
(handle-task task) (handle-task task)
(catch InterruptedException cause (catch InterruptedException cause
(throw cause)) (throw cause))
@ -678,13 +678,13 @@
(-> (db/exec-one! conn [sql:remove-not-started-tasks task queue label]) (-> (db/exec-one! conn [sql:remove-not-started-tasks task queue label])
:next.jdbc/update-count))] :next.jdbc/update-count))]
(l/debug :hint "submit task" (l/trc :hint "submit task"
:name task :name task
:queue queue :queue queue
:label label :label label
:dedupe (boolean dedupe) :dedupe (boolean dedupe)
:deleted (or deleted 0) :deleted (or deleted 0)
:in (dt/format-duration duration)) :in (dt/format-duration duration))
(db/exec-one! conn [sql:insert-new-task id task props queue (db/exec-one! conn [sql:insert-new-task id task props queue
label priority max-retries interval]) label priority max-retries interval])