fix main.clj (accept keys to run as arguments)

xray-tech · May 30, 2018 · ff1bee3 · ff1bee3
1 parent 7c27d2a
commit ff1bee3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/infra/charts/re_bench/templates/load-data-job.yaml b/infra/charts/re_bench/templates/load-data-job.yaml
@@ -23,10 +23,10 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "eu.gcr.io/xray2poc/re:{{ .Values.re.image.tag }}"
-          command: ["lein", "run"]
+          command: ["lein", "run", ":re.benchmark/loader"]
           env:
             - name: CONFIG_PATH
-              value: re/config.bench.edn
+              value: re/config.prod.edn
             - name: KAFKA
               value: "{{ .Release.Name }}-kafka:9092"
             - name: SCYLLA

diff --git a/re/resources/re/config.bench.edn b/re/resources/re/config.bench.edn
diff --git a/re/resources/re/config.prod.edn b/re/resources/re/config.prod.edn
@@ -4,4 +4,11 @@
                                "group.id" #duct/env "KAFKA_GROUP"
                                "auto.offset.reset" "earliest"}
                      :count 1
-                     :handler #ig/ref :re.handler/decoder}}
+                     :handler #ig/ref :re.handler/decoder}
+ :re.benchmark/loader {:kafka #ig/ref :re/kafka-producer
+                       :db #ig/ref :re/db
+                       :encoder #ig/ref :re/encoder
+                       :topic "events"
+                       :universes #duct/env ["BENCH_UNIVERSES" Int]
+                       :entities #duct/env ["BENCH_ENTITIES" Int]
+                       :subscription-events #duct/env ["BENCH_SUBSCRIPTION_EVENTS" Int]}}
diff --git a/re/src/re/main.clj b/re/src/re/main.clj
@@ -15,15 +15,16 @@
   (seq (ig/find-derived system :duct/daemon)))
 
 (defn -main [& args]
-  (let [config (-> (duct/read-config (io/resource (or (System/getenv "CONFIG_PATH")
+  (let [keys (or (duct/parse-keys args) [:duct/daemon])
+        config (-> (duct/read-config (io/resource (or (System/getenv "CONFIG_PATH")
                                                       "re/config.dev.edn")))
-                   (duct/prep))]
+                   (duct/prep keys))]
     (info "Start with config:")
     (pprint/pprint config)
 
     ;; FIXME we don't use duct/exec here because we want to halt system even if
     ;; there are no daemons
-    (let [system (ig/init config)]
+    (let [system (ig/init config keys)]
       (if (has-daemon? system)
         (do (duct/add-shutdown-hook ::exec #(ig/halt! system))
             (.. Thread currentThread join))