Browse Source

config file added (currently for DB settings only)

master
Christian Mueller 14 years ago
parent
commit
836deda0e5
  1. 1
      .gitignore
  2. 3
      Makefile
  3. 2
      src/NoteHub/server.clj
  4. 6
      src/NoteHub/storage.clj
  5. 1
      src/NoteHub/views/pages.clj

1
.gitignore vendored

@ -1,3 +1,4 @@
config
dump.rdb dump.rdb
resources/ resources/
pom.xml pom.xml

3
Makefile

@ -1,3 +1,6 @@
run:
lein run dev
server: server:
lein cljsbuild auto & lein cljsbuild auto &
redis-server & redis-server &

2
src/NoteHub/server.clj

@ -4,7 +4,7 @@
(server/load-views "src/NoteHub/views/") (server/load-views "src/NoteHub/views/")
(defn -main [& m] (defn -main [& m]
(let [mode (keyword (or (first m) :dev)) (let [mode (keyword (or (first m) :prod))
port (Integer. (get (System/getenv) "PORT" "8080"))] port (Integer. (get (System/getenv) "PORT" "8080"))]
(server/start port {:mode mode (server/start port {:mode mode
:ns 'NoteHub}))) :ns 'NoteHub})))

6
src/NoteHub/storage.clj

@ -1,7 +1,11 @@
(ns NoteHub.storage (ns NoteHub.storage
(:use [NoteHub.config])
(:require [clj-redis.client :as redis])) (:require [clj-redis.client :as redis]))
(def db (redis/init)) (def db
(redis/init
(when noir.options/dev-mode?
{:url (config-map :db-url)})))
(def note "note") (def note "note")

1
src/NoteHub/views/pages.clj

@ -43,6 +43,7 @@
(page-setter 404 "Nothing Found.") (page-setter 404 "Nothing Found.")
(page-setter 400 "Bad request.") (page-setter 400 "Bad request.")
(page-setter 500 "OMG, Server Exploded.")
; Routes ; Routes
; ====== ; ======

Loading…
Cancel
Save