summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortim b <timb@camcompu.home>2010-07-03 15:57:23 -0700
committertim b <timb@camcompu.home>2010-07-03 15:57:23 -0700
commit87164f2e59a9018f601ef4c375f3c2e241c45d51 (patch)
tree80c24acffcde2ca6710972bdfafe0d14b31a552a /src
parent0ec565e741daeeda5f5ee461ba122b7dafcc33c6 (diff)
testing how to get ip from request obj
Diffstat (limited to 'src')
-rw-r--r--src/config.clj7
-rw-r--r--src/site.clj3
2 files changed, 8 insertions, 2 deletions
diff --git a/src/config.clj b/src/config.clj
index b3acb10..7019096 100644
--- a/src/config.clj
+++ b/src/config.clj
@@ -3,13 +3,18 @@
;; Configuration
-(def *cookie-domain* ".dump.fm")
+(def *cookie-domain* "")
(def *server-url*
(if (= (System/getProperty "user.name") "dumpfmprod")
"http://dump.fm"
"http://localhost:8080"))
+(def *deployed*
+ (if (= (System/getProperty "user.name") "dumpfmprod")
+ :prod
+ :local))
+
(def *root-directory* (System/getProperty "user.dir"))
(def *image-directory* "images")
(def *avatar-directory* "avatars") \ No newline at end of file
diff --git a/src/site.clj b/src/site.clj
index 1405ff8..2ce42ea 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -1103,7 +1103,8 @@ order by count desc limit ? offset ?")
(.toString st)))
(defn show-ip [request]
- (str request (:headers request))
+ (let [ip (:x-real-ip (:headers request))
+ ip (if ip ip (:remote-addr request))] (str ip))
)
;; Compojure Routes