Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/source/jobs/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
[clojure.data.json :as json]
[source.services.interface :as services]
[source.jobs.oplog :as oplog]
[source.jobs.handlers :as handlers]))
[source.jobs.handlers :as handlers]
[taoensso.telemere :as t]))

(defn prepare-congest-metadata
"given raw job metadata, returns extended metadata necessary for use with congest"
Expand Down Expand Up @@ -54,6 +55,7 @@
:interval (if (some? interval)
(+' interval (*' 1000 5 i))
0))]
(t/log! (str "scheduling " job-id " " handler " " initial-delay "ms from now" "..."))
(prepare-congest-metadata ds metadata))))
jobs
(-> jobs count inc range))))
Expand Down
5 changes: 3 additions & 2 deletions src/source/routes/feeds.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
(res/response)))

(defn post
{:summary "adds a feed and extracts data from RSS feed URL to create incoming posts and schedules a job to keep them updated"
{:dev/debt "job service cleanup required here, the job scheduling function needs to move and the function itself needs cleanup"
:summary "adds a feed and extracts data from RSS feed URL to create incoming posts and schedules a job to keep them updated"
:parameters {:body (-> schemas/Feed
(api/missoc :id :title :user-id :created-at :updated-at :state))}
:responses (api/success schemas/Feed)}
Expand All @@ -43,7 +44,7 @@
(->> (jobs/prepare-congest-metadata
ds
{:id (str email "-" (:id new-feed))
:initial-delay (* 1000 60 60 24)
:initial-delay 0
:auto-start true
:stop-after-fail false,
:interval (* 1000 60 60 24)
Expand Down
4 changes: 2 additions & 2 deletions src/source/routes/job_deregister.clj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
:params (api/params :path [:map [:id :int]])
:responses (api/success (api/response-schema))}
[{:keys [js ds path-params] :as _req}]
(let [job (services/job ds path-params)]
(jobs/deregister! js (Integer/parseInt (:job-id job)))
(let [job (services/job ds {:id (Integer/parseInt (:id path-params))})]
(jobs/deregister! js (:job-id job))
(res/response {:message "successfully deregistered job"})))
4 changes: 2 additions & 2 deletions src/source/routes/job_start.clj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
:params (api/params :path [:map [:id :int]])
:responses (api/success (api/response-schema))}
[{:keys [js ds path-params]}]
(let [job (services/job ds path-params)]
(jobs/start! js ds (Integer/parseInt (:job-id job)))
(let [job (services/job ds {:id (Integer/parseInt (:id path-params))})]
(jobs/start! js ds (:job-id job))
(res/response {:message "successfully started job"})))
4 changes: 2 additions & 2 deletions src/source/routes/job_stop.clj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
:params (api/params :path [:map [:id :int]])
:responses (api/success (api/response-schema))}
[{:keys [js ds path-params]}]
(let [job (services/job ds path-params)]
(jobs/stop! js (Integer/parseInt (:job-id job)) false)
(let [job (services/job ds {:id (Integer/parseInt (:id path-params))})]
(jobs/stop! js (:job-id job) false)
(res/response {:message "successfully stopped job"})))
Loading