Merge pull request #147 from alphagov/standardised-json-logging-for-g…

…ovuk Using logstasher 0.4.0 to standardise logging
alphagov · Dec 18, 2013 · 65fe409 · 65fe409
2 parents 9f6fe3c + e89008b
commit 65fe409
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -32,7 +32,7 @@ end
 gem 'has_scope'
 gem 'inherited_resources'
 gem 'kaminari', '0.13.0'
-gem 'lograge', '0.2.0'
+gem 'logstasher', '0.4.0'
 gem "mongoid_rails_migrations", "1.0.0"
 gem 'null_logger'
 gem 'plek', '1.4.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -157,9 +157,9 @@ GEM
       less-rails (~> 2.2.0)
     libv8 (3.11.8.17)
     link_header (0.0.7)
-    lograge (0.2.0)
-      actionpack
-      activesupport
+    logstash-event (1.1.5)
+    logstasher (0.4.0)
+      logstash-event (~> 1.1.0)
     lrucache (0.1.4)
       PriorityQueue (~> 0.1.2)
     mail (2.5.4)
@@ -324,7 +324,7 @@ DEPENDENCIES
   kaminari (= 0.13.0)
   launchy
   less-rails-bootstrap
-  lograge (= 0.2.0)
+  logstasher (= 0.4.0)
   minitest (= 3.3.0)
   mlanett-redis-lock (= 0.2.2)
   mocha (= 0.13.3)

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -60,6 +60,4 @@
   config.assets.digest = true
 
   config.action_mailer.delivery_method = :ses
-
-  config.lograge.enabled = true
 end