Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

i am stupid

  • Loading branch information...
commit 539bd22c4f6321ca5948cabda23d73bfe20d1a42 1 parent 6f9591c
Hampton Catlin authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 config.ru
4 config.ru
View
@@ -15,7 +15,7 @@ require 'merb-core'
Merb::Config.setup(:merb_root => ::File.expand_path(::File.dirname(__FILE__)),
:environment => ENV['RACK_ENV'])
-#Merb.environment = "production"
+Merb.environment = "production"
Merb.root = Merb::Config[:merb_root]
Merb::BootLoader.run
@@ -25,7 +25,7 @@ if defined?(PhusionPassenger)
puts "RESETTING MEMCACHED"
Cache.instance_variable_get(:@cache).reset
if defined?(Server)
- Server.reset
+ Server.reset!
end
else
# We're in conservative spawning mode. We don't need to do anything.
Please sign in to comment.
Something went wrong with that request. Please try again.