Changeset 1017

Timestamp:

11/17/07 13:10:18 (1 year ago)

Author:

e.@brainspl.at

Message:

make sure action caching is properly loaded

Files:

• trunk/lib/merb.rb (modified) (1 diff)
• trunk/lib/merb/controller.rb (modified) (1 diff)

trunk/lib/merb.rb

@@ -15 +15 @@
-    require 'mongrel'
-        puts "EVENT variable set but swiftiply not installed - falling back to normal Mongrel"
+  end
+elsif ENV['PACKET']
+  begin
+    require 'packet_mongrel' 
+    puts "Using Packet Mongrel"
+  rescue LoadError
+    require 'mongrel'
+        puts "PACKET variable set but packet not installed - falling back to normal Mongrel"
-  end
-else

trunk/lib/merb/controller.rb

@@ -18 +18 @@
-    include Merb::ResponderMixin
-    include Merb::ControllerExceptions
+    include Merb::Caching::Actions
-        
-    class << self