lib/deimos/utils/db_poller.rb in deimos-ruby-1.8.7 vs lib/deimos/utils/db_poller.rb in deimos-ruby-1.9.0

@@ -66,10 +66,10 @@
         end
       end
 
       # Grab the PollInfo or create if it doesn't exist.
       def retrieve_poll_info
-        ActiveRecord::Base.connection.reconnect!
+        ActiveRecord::Base.connection.reconnect! unless ActiveRecord::Base.connection.open_transactions.positive?
         new_time = @config.start_from_beginning ? Time.new(0) : Time.zone.now
         @info = Deimos::PollInfo.find_by_producer(@config.producer_class) ||
                 Deimos::PollInfo.create!(producer: @config.producer_class,
                                          last_sent: new_time,
                                          last_sent_id: 0)