Make logging an option. Logging is turned on by default.

bmizerany · Apr 7, 2008 · 80d4bec · 80d4bec
1 parent 081f71e
commit 80d4bec
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/lib/sinatra.rb b/lib/sinatra.rb
@@ -114,13 +114,9 @@ def env
   end
 
   def build_application
-    app = if Sinatra.options.sessions == true
-      Rack::Session::Cookie.new(application)
-    else
-      application
-    end
-
-    Rack::CommonLogger.new(app)
+    app = application
+    app = Rack::Session::Cookie.new(app) if Sinatra.options.sessions == true
+    app = Rack::CommonLogger.new(app) if Sinatra.options.logging == true
   end
 
   def run
@@ -632,6 +628,7 @@ def self.default_options
         :views => Dir.pwd + '/views',
         :public => Dir.pwd + '/public',
         :sessions => false,
+        :logging => true,
       }
     end