incorporate the upstream changes that i accidentally clobbered

braintreeps · Nov 18, 2008 · 39dabfb · 39dabfb
1 parent d06baad
commit 39dabfb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/data_fabric.rb b/lib/data_fabric.rb
@@ -164,7 +164,7 @@ def disconnect!
     end
 
     def verify!(arg)
-      connection.verify!(0) if connected?
+      connection.verify!(arg) if connected?
     end
 
     def with_master
@@ -205,6 +205,7 @@ def connection
         cached_connections[name] = @model_class.connection
         @model_class.active_connections[@model_class.name] = self
       end
+      cached_connections[name].verify!(3600)
       cached_connections[name]
     end