Skip to content
Snippets Groups Projects
Unverified Commit 4028dc65 authored by dpsutton's avatar dpsutton Committed by GitHub
Browse files

Sync startup cleanups (#14428)

* Log db info from db query

we're already making the query might as well also get the information
we want to log

* Alignment settings in .dir-locals

* Inverted logic for logging fingerprint vs refingerprint
parent 93faa7c2
No related merge requests found
......@@ -28,6 +28,7 @@
(p/def-map-type '(2 nil nil (:defn)))
(p.types/defrecord+ '(2 nil nil (:defn)))
(tools.macro/macrolet '(1 (:defn))))))
(clojure-indent-style . always-align)
;; if you're using clj-refactor (highly recommended!)
(cljr-favor-prefix-notation . nil)
;; prefer keeping source width about ~118, GitHub seems to cut off stuff at either 119 or 120 and
......
......@@ -68,17 +68,19 @@
;; if the sync operation schedules have changed, we need to reschedule this DB
(when (or new-metadata-schedule new-fieldvalues-schedule)
(let [{old-metadata-schedule :metadata_sync_schedule
old-fieldvalues-schedule :cache_field_values_schedule} (db/select-one [Database
:metadata_sync_schedule
:cache_field_values_schedule]
:id (u/get-id database))
old-fieldvalues-schedule :cache_field_values_schedule
existing-engine :engine
existing-name :name} (db/select-one [Database
:metadata_sync_schedule
:cache_field_values_schedule]
:id (u/the-id database))
;; if one of the schedules wasn't passed continue using the old one
new-metadata-schedule (or new-metadata-schedule old-metadata-schedule)
new-fieldvalues-schedule (or new-fieldvalues-schedule old-fieldvalues-schedule)]
new-metadata-schedule (or new-metadata-schedule old-metadata-schedule)
new-fieldvalues-schedule (or new-fieldvalues-schedule old-fieldvalues-schedule)]
(when-not (= [new-metadata-schedule new-fieldvalues-schedule]
[old-metadata-schedule old-fieldvalues-schedule])
(log/info
(trs "{0} Database ''{1}'' sync/analyze schedules have changed!" (:engine database) (:name database))
(trs "{0} Database ''{1}'' sync/analyze schedules have changed!" existing-engine existing-name)
"\n"
(trs "Sync metadata was: ''{0}'' is now: ''{1}''" old-metadata-schedule new-metadata-schedule)
"\n"
......
......@@ -198,7 +198,7 @@
;; store is bound so DB timezone can be used in date coercion logic
(qp.store/store-database! database)
(reduce (fn [acc table]
(log-progress-fn (if *refingerprint?* "fingerprint-fields" "refingerprint-fields") table)
(log-progress-fn (if *refingerprint?* "refingerprint-fields" "fingerprint-fields") table)
(let [results (if (= :googleanalytics (:engine database))
(empty-stats-map 0)
(fingerprint-fields! table))
......
......@@ -249,7 +249,7 @@
[database]
(if-let [randomized-schedules (randomized-schedules database)]
(u/prog1 (merge database randomized-schedules)
(db/update! Database (u/id database) randomized-schedules))
(db/update! Database (u/the-id database) randomized-schedules))
database))
(defmethod task/init! ::SyncDatabases
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment