diff --git a/backend/src/app/storage.clj b/backend/src/app/storage.clj index 413b33882e..eeee57f465 100644 --- a/backend/src/app/storage.clj +++ b/backend/src/app/storage.clj @@ -305,7 +305,7 @@ (recur (+ n ^long total))) (do (l/info :task "gc-deleted" - :action "permanently delete items" + :hint "permanently delete items" :count n) {:deleted n}))))))) @@ -379,10 +379,10 @@ (+ cntd (count to-delete)))) (do (l/info :task "gc-touched" - :action "mark freeze" + :hint "mark freeze" :count cntf) (l/info :task "gc-touched" - :action "mark for deletion" + :hint "mark for deletion" :count cntd) {:freeze cntf :delete cntd}))))))) @@ -461,7 +461,7 @@ (+ d (count to-delete)))) (do (l/info :task "recheck" - :action "recheck items" + :hint "recheck items" :processed n :deleted d) {:processed n :deleted d}))))))) diff --git a/backend/src/app/tasks/file_media_gc.clj b/backend/src/app/tasks/file_media_gc.clj index 39d194f685..17d40c9041 100644 --- a/backend/src/app/tasks/file_media_gc.clj +++ b/backend/src/app/tasks/file_media_gc.clj @@ -90,7 +90,7 @@ unused (->> (db/query conn :file-media-object {:file-id id}) (remove #(contains? used (:id %))))] - (l/debug :action "processing file" + (l/debug :hint "processing file" :id id :age age :to-delete (count unused)) @@ -101,7 +101,7 @@ {:id id}) (doseq [mobj unused] - (l/debug :action "deleting media object" + (l/debug :hint "deleting media object" :id (:id mobj) :media-id (:media-id mobj) :thumbnail-id (:thumbnail-id mobj)) diff --git a/backend/src/app/tasks/file_offload.clj b/backend/src/app/tasks/file_offload.clj index a43afb8a94..e429d3872c 100644 --- a/backend/src/app/tasks/file_offload.clj +++ b/backend/src/app/tasks/file_offload.clj @@ -29,7 +29,7 @@ (defn- offload-candidate [{:keys [storage conn backend] :as cfg} {:keys [id data] :as file}] - (l/debug :action "offload file data" :id id) + (l/debug :hint "offload file data" :id id) (let [backend (simpl/resolve-backend storage backend)] (->> (simpl/content data) (simpl/put-object backend file)) diff --git a/backend/src/app/tasks/file_xlog_gc.clj b/backend/src/app/tasks/file_xlog_gc.clj index b8dce2fa51..7b4e21ad5f 100644 --- a/backend/src/app/tasks/file_xlog_gc.clj +++ b/backend/src/app/tasks/file_xlog_gc.clj @@ -28,7 +28,8 @@ (let [interval (db/interval max-age) result (db/exec-one! conn [sql:delete-files-xlog interval]) result (:next.jdbc/update-count result)] - (l/debug :removed result :hint "remove old file changes") + (l/info :hint "remove old file changes" + :removed result) result)))) (def ^:private diff --git a/backend/src/app/tasks/objects_gc.clj b/backend/src/app/tasks/objects_gc.clj index 9d2e44146f..dc66a9aff9 100644 --- a/backend/src/app/tasks/objects_gc.clj +++ b/backend/src/app/tasks/objects_gc.clj @@ -48,7 +48,7 @@ result (db/exec! conn [sql max-age])] (doseq [{:keys [id] :as item} result] - (l/trace :action "delete object" :table table :id id)) + (l/trace :hint "delete object" :table table :id id)) (count result))) @@ -63,7 +63,7 @@ backend (simpl/resolve-backend storage (cf/get :fdata-storage-backend))] (doseq [{:keys [id] :as item} result] - (l/trace :action "delete object" :table table :id id) + (l/trace :hint "delete object" :table table :id id) (when backend (simpl/del-object backend item))) @@ -78,7 +78,7 @@ fonts (db/exec! conn [sql max-age]) storage (assoc storage :conn conn)] (doseq [{:keys [id] :as font} fonts] - (l/trace :action "delete object" :table table :id id) + (l/trace :hint "delete object" :table table :id id) (some->> (:woff1-file-id font) (sto/del-object storage)) (some->> (:woff2-file-id font) (sto/del-object storage)) (some->> (:otf-file-id font) (sto/del-object storage)) @@ -95,7 +95,7 @@ storage (assoc storage :conn conn)] (doseq [{:keys [id] :as team} teams] - (l/trace :action "delete object" :table table :id id) + (l/trace :hint "delete object" :table table :id id) (some->> (:photo-id team) (sto/del-object storage))) (count teams))) @@ -127,7 +127,7 @@ storage (assoc storage :conn conn)] (doseq [{:keys [id] :as profile} profiles] - (l/trace :action "delete object" :table table :id id) + (l/trace :hint "delete object" :table table :id id) ;; Mark the owned teams as deleted; this enables them to be processed ;; in the same transaction in the "team" table step. diff --git a/backend/src/app/tasks/tasks_gc.clj b/backend/src/app/tasks/tasks_gc.clj index 788e292697..1350c4abf8 100644 --- a/backend/src/app/tasks/tasks_gc.clj +++ b/backend/src/app/tasks/tasks_gc.clj @@ -28,7 +28,7 @@ (let [interval (db/interval max-age) result (db/exec-one! conn [sql:delete-completed-tasks interval]) result (:next.jdbc/update-count result)] - (l/debug :action "trim completed tasks table" :removed result) + (l/debug :hint "trim completed tasks table" :removed result) result)))) (def ^:private