Permalink
Browse files
Account for versioned jar path.
- Loading branch information...
Showing
with
16 additions
and
14 deletions.
-
+5
−5
src/clj/fleetdb/server.clj
-
+11
−9
test/run.clj
|
|
@@ -1,6 +1,5 @@ |
|
|
(ns fleetdb.server
|
|
|
- (:use (fleetdb util)
|
|
|
- (clojure.contrib [def :only (defvar-)]))
|
|
|
+ (:use (fleetdb util))
|
|
|
(:require (fleetdb [file :as file] [thread-pool :as thread-pool]
|
|
|
[lint :as lint] [embedded :as embedded])
|
|
|
(clj-stacktrace [repl :as stacktrace])
|
|
|
@@ -15,9 +14,10 @@ |
|
|
(joptsimple OptionParser OptionSet OptionException))
|
|
|
(:gen-class))
|
|
|
|
|
|
-(let [stream (.getResourceAsStream (RT/baseLoader) "project.clj")
|
|
|
- version (nth (read-string (du/slurp* stream)) 2)]
|
|
|
- (defvar- fleetdb-version version))
|
|
|
+
|
|
|
+(def fleetdb-version
|
|
|
+ (let [stream (.getResourceAsStream (RT/baseLoader) "project.clj")]
|
|
|
+ (nth (read-string (du/slurp* stream)) 2)))
|
|
|
|
|
|
(defn- info-map [dba]
|
|
|
(let [base {"fleetdb-version" fleetdb-version}
|
|
|
|
|
|
@@ -1,5 +1,6 @@ |
|
|
(use 'clj-unit.core)
|
|
|
-(use '(fleetdb [file :only (exist?)]))
|
|
|
+(require '[fleetdb.file :as file])
|
|
|
+(require '[fleetdb.server :as server])
|
|
|
|
|
|
(def base-tests
|
|
|
['fleetdb.compare-test
|
|
|
@@ -14,14 +15,15 @@ |
|
|
|
|
|
(defn boot-servers []
|
|
|
(println "Booting servers...")
|
|
|
- (when-not (exist? "fleetdb-standalone.jar")
|
|
|
- (println "fleetdb-standalone.jar missing: run `lein uberjar`")
|
|
|
- (System/exit 1))
|
|
|
- (let [procs
|
|
|
- [(exec "java""-cp" "fleetdb-standalone.jar" "fleetdb.server" "-e" "-p" "3400")
|
|
|
- (exec "java""-cp" "fleetdb-standalone.jar" "fleetdb.server" "-e" "-p" "3401" "-x" "pass")]]
|
|
|
- (Thread/sleep 2000)
|
|
|
- procs))
|
|
|
+ (let [path (str "fleetdb-standalone-" server/fleetdb-version ".jar")]
|
|
|
+ (when-not (file/exist? path)
|
|
|
+ (println path "missing: run `lein uberjar`")
|
|
|
+ (System/exit 1))
|
|
|
+ (let [procs
|
|
|
+ [(exec "java" "-cp" path "fleetdb.server" "-e" "-p" "3400")
|
|
|
+ (exec "java" "-cp" path "fleetdb.server" "-e" "-p" "3401" "-x" "pass")]]
|
|
|
+ (Thread/sleep 2000)
|
|
|
+ procs)))
|
|
|
|
|
|
(defn kill-servers [procs]
|
|
|
(doseq [#^Process proc procs]
|
|
|
|
0 comments on commit
6aeae72