summaryrefslogtreecommitdiff
path: root/lib/environment.rb
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2010-05-11 16:30:20 +0200
committermguetlein <martin.guetlein@gmail.com>2010-05-11 16:30:20 +0200
commit73d2b2159347d5d2fe4cf9f4a5af0c598707993b (patch)
tree12fe900b9b6090288f0f280d3e3a8a593395ce50 /lib/environment.rb
parentb5a5b7aab800f1268b675683b345042e901e75e2 (diff)
fix ip logging, increase task runtime
Diffstat (limited to 'lib/environment.rb')
-rw-r--r--lib/environment.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/environment.rb b/lib/environment.rb
index f89a758..3d4cd69 100644
--- a/lib/environment.rb
+++ b/lib/environment.rb
@@ -41,7 +41,7 @@ if @@config[:database]
end
# hack: store sinatra in global var to make url_for and halt methods accessible
-before {$sinatra = self unless $sinatra}
+before{ $sinatra = self unless $sinatra }
class Sinatra::Base
# overwriting halt to log halts (!= 202)
@@ -79,7 +79,7 @@ class MyLogger < Logger
end
def format(msg)
- pwd.ljust(18)+" :: "+msg.to_s+" :: "+trace+" :: "+ENV['REMOTE_ADDR'].to_s
+ pwd.ljust(18)+" :: "+msg.to_s+" :: "+trace+" :: "+($sinatra ? $sinatra.request.env['REMOTE_ADDR'] : nil).to_s
end
def debug(msg)