0
@@ -20,6 +20,10 @@ module ActiveReload
0
     def self.setup_for(master, slave = nil)
0
       slave ||= ActiveRecord::Base
0
       slave.send :include, ActiveRecordConnectionMethods
0
+      # extend observer to always use the master database
0
+      # observers only get triggered on writes, so shouldn't be a performance hit
0
+      # removes a race condition if you are using conditionals in the observer
0
+      ActiveRecord::Observer.send :include, ActiveReload::ObserverExtensions
0
       ActiveRecord::Base.active_connections[slave.name] = new(master, slave)
0
     end
0
 
0
@@ -60,4 +64,21 @@ module ActiveReload
0
       connection.with_master { reload_without_master }
0
     end
0
   end
0
+  
0
+  module ObserverExtensions
0
+    def self.included(base)
0
+      base.alias_method_chain :update, :masterdb
0
+    end
0
+    
0
+    # Send observed_method(object) if the method exists.
0
+    def update_with_masterdb(observed_method, object) #:nodoc:
0
+      if object.class.connection.respond_to?(:with_master)
0
+        object.class.connection.with_master do
0
+          update_without_masterdb(observed_method, object)
0
+        end
0
+      else
0
+        update_without_masterdb(observed_method, object)
0
+      end
0
+    end
0
+  end
0
 end
0
\ No newline at end of file