Disable loading of data-store and other stuff if funnelcake is disabled.

mnutt · Mar 21, 2010 · f7ef8c7 · f7ef8c7
1 parent 6499f42
commit f7ef8c7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/funnel_cake.rb b/lib/funnel_cake.rb
@@ -46,7 +46,7 @@ def event(name, opts={}, &block)
   end
 
   class << self
-    @@configuration = nil
+    @@configuration ||= nil
 
     # Accessors for FunnelCake's configuration settings
     def configuration; @@configuration; end
@@ -76,6 +76,7 @@ def reset_configuration
 
     # Initializes the FunnelCake library, and applies the configuration settings
     def run
+      return unless enabled?
       initialize_datastore_hooks!
       initialize_state_machine!
     end