Browse Source

Merge branch 'master' of https://github.com/yogthos/FrameworkBenchmarks into 848

James Yen 11 years ago
parent
commit
9b7b29a670
2 changed files with 10 additions and 8 deletions
  1. 7 5
      luminus/hello/project.clj
  2. 3 3
      luminus/hello/src/hello/handler.clj

+ 7 - 5
luminus/hello/project.clj

@@ -3,15 +3,16 @@
   "luminus"
   :dependencies
   [[org.clojure/clojure "1.5.1"]
-   [lib-noir "0.7.9"]
+   [lib-noir "0.8.2"]
    [compojure "1.1.6"]
    [ring-server "0.3.1"]
    [selmer "0.5.7"]
    [com.taoensso/timbre "2.7.1"]
    [com.postspectacular/rotor "0.1.0"]
-   [com.taoensso/tower "1.5.1"]
+   [com.taoensso/tower "2.0.2"]
    [mysql/mysql-connector-java "5.1.28"]
-   [korma "0.3.0-RC5"]
+   [korma "0.3.0-RC6"]
+   [c3p0/c3p0 "0.9.1.2"]
    [log4j
     "1.2.17"
     :exclusions
@@ -24,11 +25,12 @@
    :init hello.handler/init,
    :destroy hello.handler/destroy}
   :profiles
-  {:production
+  {:uberjar {:aot :all}
+   :production
    {:ring
     {:open-browser? false, :stacktraces? false, :auto-reload? false}},
    :dev
-   {:dependencies [[ring-mock "0.1.5"] [ring/ring-devel "1.2.1"]]}}
+   {:dependencies [[ring-mock "0.1.5"] [ring/ring-devel "1.2.2"]]}}
   :url
   "http://example.com/FIXME"
   :plugins

+ 3 - 3
luminus/hello/src/hello/handler.clj

@@ -4,7 +4,7 @@
   (:require [noir.util.middleware :as middleware]
             [compojure.route :as route]
             [taoensso.timbre :as timbre]
-            [com.postspectacular.rotor :as rotor]))
+            [taoensso.timbre.appenders.rotor :as rotor]))
 
 (defroutes app-routes
   (route/resources "/")
@@ -25,11 +25,11 @@
      :enabled? true
      :async? false ; should be always false for rotor
      :max-message-per-msecs nil
-     :fn rotor/append})
+     :fn rotor/appender-fn})
 
   (timbre/set-config!
     [:shared-appender-config :rotor]
-    {:path "hello.log" :max-size 10000 :backlog 10})
+    {:path "{{sanitized}}.log" :max-size (* 512 1024) :backlog 10})
 
   (timbre/info "hello started successfully"))