     (jdbc/with-transacted-connection db
       (scf-storage/maybe-activate-node! certname producer-timestamp)
       (scf-storage/add-report! report received))
-    (log/info (trs "[{0}-{1}] [{2} ms] ''{3}'' puppet v{4} command processed for {5}"
-                   (str id)
-                   (str (tcoerce/to-long received))
-                   (in-millis (interval start-time (now)))
-                   (command-names :store-report)
-                   puppet_version
-                   certname))))
+    (log-command-processed-messsage id received start-time :store-report certname
+                                    {:puppet-version puppet_version})))
 
 (defn store-report [{:keys [payload version received] :as command} start-time db]
   (let [validated-payload (upon-error-throw-fatality

      (when command-stream
        (.close command-stream)))))

;; Catalog replacement

(defn replace-catalog*

    (jdbc/with-transacted-connection' db :repeatable-read
      (scf-storage/maybe-activate-node! certname producer-timestamp)
      (scf-storage/replace-facts! fact-data))
    (log-command-processed-messsage id received start-time :replace-facts certname)))

(defn replace-facts [{:keys [payload version received] :as command} start-time db]
  (replace-facts* (upon-error-throw-fatality
