From 1aa8b132527c0ce54ba677c71a794db7355f0867 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Thu, 9 Jun 2016 14:37:38 +0200
Subject: [PATCH] Sync sinatra logger with global logger, the chaos with
 logging probably must remain though.

---
 config.ru  |  4 ++++
 lib/api.rb | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/config.ru b/config.ru
index c7ba665..91048e8 100644
--- a/config.ru
+++ b/config.ru
@@ -9,5 +9,9 @@ require './lib/nebula.rb'
 require './lib/api.rb'
 
 $logger = Logger.new(STDOUT)
+$logger.formatter = proc do |severity, datetime, progname, msg|
+  date_format = datetime.strftime("%Y-%m-%dT%H:%M:%S%z")
+  sprintf "[#{date_format}] %5s: #{msg}\n", severity
+end
 $nebula = Now::Nebula.new()
 run Now::Application
diff --git a/lib/api.rb b/lib/api.rb
index ead98eb..9396775 100644
--- a/lib/api.rb
+++ b/lib/api.rb
@@ -14,6 +14,16 @@ module Now
       @nebula = $nebula
     end
 
+    configure do
+      enable :logging, :dump_errors
+      set :raise_errors, true
+    end
+
+    before do
+      # to sinatra request logger point to proper object
+      env['rack.logger'] = $logger
+    end
+
     get '/' do
       cross_origin
       API_VERSION
-- 
1.8.2.3