Skip to content

Commit 9eb205d

Browse files
committed
move integrant to new namespace
1 parent 4a48f4e commit 9eb205d

File tree

3 files changed

+27
-25
lines changed

3 files changed

+27
-25
lines changed

src/cronut.clj

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
(ns cronut
22
(:refer-clojure :exclude [proxy])
3-
(:require [clojure.tools.logging :as log]
4-
[integrant.core :as ig])
5-
(:import (org.quartz Scheduler Job SimpleScheduleBuilder JobExecutionException JobBuilder TriggerBuilder JobDetail CronScheduleBuilder DisallowConcurrentExecution)
3+
(:require [clojure.tools.logging :as log])
4+
(:import (java.util TimeZone)
5+
(org.quartz CronScheduleBuilder DisallowConcurrentExecution Job JobBuilder JobDetail JobExecutionException Scheduler SimpleScheduleBuilder TriggerBuilder)
66
(org.quartz.impl StdSchedulerFactory)
7-
(org.quartz.spi JobFactory TriggerFiredBundle)
8-
(java.util TimeZone)))
7+
(org.quartz.spi JobFactory TriggerFiredBundle)))
98

109
(defn base-trigger-builder
1110
"Provide a base trigger-builder from configuration"
@@ -153,17 +152,4 @@
153152

154153
(defn shutdown
155154
[scheduler]
156-
(.shutdown ^Scheduler scheduler))
157-
158-
(defmethod ig/init-key :cronut/scheduler
159-
[_ config]
160-
(initialize config))
161-
162-
(defmethod ig/halt-key! :cronut/scheduler
163-
[_ scheduler]
164-
(shutdown scheduler))
165-
166-
(def data-readers
167-
{'cronut/trigger cronut/trigger-builder
168-
'cronut/cron cronut/shortcut-cron
169-
'cronut/interval cronut/shortcut-interval})
155+
(.shutdown ^Scheduler scheduler))

src/cronut/integrant.clj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
(ns cronut.integrant
2+
(:require [cronut :as cronut]
3+
[integrant.core :as ig]))
4+
5+
(defmethod ig/init-key :cronut/scheduler
6+
[_ config]
7+
(cronut/initialize config))
8+
9+
(defmethod ig/halt-key! :cronut/scheduler
10+
[_ scheduler]
11+
(cronut/shutdown scheduler))
12+
13+
(def data-readers
14+
{'cronut/trigger cronut/trigger-builder
15+
'cronut/cron cronut/shortcut-cron
16+
'cronut/interval cronut/shortcut-interval})

test/cronut/integration_fixture.clj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
(ns cronut.integration-fixture
2-
(:require [clojure.java.io :as io]
3-
[clojure.core.async :as async]
2+
(:require [clojure.core.async :as async]
3+
[clojure.java.io :as io]
44
[clojure.tools.logging :as log]
5-
[cronut :as cronut]
5+
[cronut.integrant :as cig]
66
[integrant.core :as ig])
7-
(:import (org.quartz Job)
8-
(java.util UUID)))
7+
(:import (java.util UUID)
8+
(org.quartz Job)))
99

1010
(defrecord TestDefrecordJobImpl [identity description recover? durable? test-dep]
1111
Job
@@ -42,4 +42,4 @@
4242
([config]
4343
(init-system config nil))
4444
([config readers]
45-
(ig/init (ig/read-string {:readers (merge cronut/data-readers readers)} config))))
45+
(ig/init (ig/read-string {:readers (merge cig/data-readers readers)} config))))

0 commit comments

Comments
 (0)