configuration file getter changes. toggle selmer caching off if in "development environment"
This commit is contained in:
parent
01aeb70ed3
commit
3029eba653
|
@ -15,7 +15,8 @@
|
||||||
(reset! site-config (load-config))
|
(reset! site-config (load-config))
|
||||||
@site-config))
|
@site-config))
|
||||||
|
|
||||||
(defn get-db-config
|
(defn config-val [key]
|
||||||
"returns just the database portion of the site configuration"
|
(get (get-config) key))
|
||||||
[]
|
|
||||||
(:database (get-config)))
|
(defn config-val-in [ks]
|
||||||
|
(get-in (get-config) ks))
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
blarg.routes.files
|
blarg.routes.files
|
||||||
blarg.routes.rss
|
blarg.routes.rss
|
||||||
blarg.routes.accessrules
|
blarg.routes.accessrules
|
||||||
|
blarg.config
|
||||||
ring.middleware.head
|
ring.middleware.head
|
||||||
compojure.core)
|
compojure.core)
|
||||||
(:require [noir.util.middleware :as middleware]
|
(:require [noir.util.middleware :as middleware]
|
||||||
|
@ -12,6 +13,7 @@
|
||||||
[compojure.route :as route]
|
[compojure.route :as route]
|
||||||
[taoensso.timbre :as timbre]
|
[taoensso.timbre :as timbre]
|
||||||
[com.postspectacular.rotor :as rotor]
|
[com.postspectacular.rotor :as rotor]
|
||||||
|
[selmer.parser :as parser]
|
||||||
[blarg.views.layout :as layout]
|
[blarg.views.layout :as layout]
|
||||||
[blarg.models.db :as db]))
|
[blarg.models.db :as db]))
|
||||||
|
|
||||||
|
@ -43,6 +45,9 @@
|
||||||
|
|
||||||
(timbre/info "blarg started successfully")
|
(timbre/info "blarg started successfully")
|
||||||
|
|
||||||
|
(if (= "DEV" (config-val :env))
|
||||||
|
(parser/toggle-caching))
|
||||||
|
|
||||||
(timbre/info "touching database...")
|
(timbre/info "touching database...")
|
||||||
(db/touch-databases))
|
(db/touch-databases))
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
(ns blarg.models.db
|
(ns blarg.models.db
|
||||||
(:use [blarg.util])
|
(:use [blarg.util])
|
||||||
(:require [blarg.config :as config]
|
(:require [blarg.config :refer [config-val]]
|
||||||
[com.ashafa.clutch :as couch]))
|
[com.ashafa.clutch :as couch]))
|
||||||
|
|
||||||
(defn db-url [db]
|
(defn db-url [db]
|
||||||
(let [c (config/get-db-config)
|
(let [c (config-val :database)
|
||||||
url (:url c)
|
url (:url c)
|
||||||
user (:user c)
|
user (:user c)
|
||||||
pass (:pass c)]
|
pass (:pass c)]
|
||||||
|
|
Reference in a new issue