summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsostler <sbostler@gmail.com>2010-02-28 11:28:00 -0500
committersostler <sbostler@gmail.com>2010-02-28 11:28:00 -0500
commit66507c7b3444ca3cdb0a90e0842ae01b91751612 (patch)
tree7ff39bdf11b73b866932f9732b94925f6b60afe1 /src
parentaa48516c2100a6c1b2f2a67910dbd26387d80041 (diff)
Added port config
Diffstat (limited to 'src')
-rwxr-xr-xsrc/site.clj34
1 files changed, 21 insertions, 13 deletions
diff --git a/src/site.clj b/src/site.clj
index f039703..2c41946 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -8,10 +8,11 @@
javax.servlet.http.Cookie
org.antlr.stringtemplate.StringTemplateGroup)
(:use clojure.xml
- clojure.contrib.str-utils
+ clojure.contrib.command-line
clojure.contrib.duck-streams
clojure.contrib.json.write
clojure.contrib.sql
+ clojure.contrib.str-utils
compojure
utils
cookie-login
@@ -637,7 +638,7 @@
(GET "/browser" (browser session))
(GET "/refresh" (validated-refresh session params))
(GET "/log" (validated-log session "RoomA" "0" params))
- (GET "/:room/log" (validated-log session
+ (GET "/:room/log" (validated-log session
(-> request :route-params :room)
"0" params))
(GET "/:room/log/:offset" (validated-log session
@@ -650,7 +651,7 @@
(POST "/submit-registration" (register session params))
(POST "/update-profile" (update-profile session params))
(POST "/set-topic" (validate-set-topic session params))
- (GET "/about_us" (serve-template "about_us" session))
+ (GET "/about_us" (serve-template "about_us" session))
(GET "/goodies" (serve-template "goodies" session))
(GET "/help" (serve-template "help" session))
(GET "/privacy" (serve-template "privacy" session))
@@ -698,16 +699,23 @@
(alter rooms assoc (room-db :key)
(build-room-map-from-db room-db))))
-(defn start-server
- ([port] (run-server {:port port}
- "/static/*" (servlet static)
- "/images/*" (servlet static)
- "/avatars/*" (servlet static)
- "/upload/*" (servlet multipart)
- "/*" (servlet pichat)))
- ([] (start-server 8080)))
+(defn start-server [port]
+ (run-server {:port port}
+ "/static/*" (servlet static)
+ "/images/*" (servlet static)
+ "/avatars/*" (servlet static)
+ "/upload/*" (servlet multipart)
+ "/*" (servlet pichat)))
+
+(defn parse-command-args
+ "Parses command-line arguments. First arg is script name,
+ second arg is port number (defaults to 8080)."
+ ([script] {:port 8080})
+ ([script port] {:port (maybe-parse-int port)}))
+
+(prn *command-line-args*)
+(def options (apply parse-command-args *command-line-args*))
-(start-server)
(start-user-flusher!)
(start-session-pruner!)
-
+(start-server (options :port)) \ No newline at end of file