lib/mysql_mutex.rb in distributed_mutex-1.1.0 vs lib/mysql_mutex.rb in distributed_mutex-1.1.1

- old
+ new

@@ -83,24 +83,32 @@ end end at_exit do - locks = MySQLMutex.active_locks - locks.delete_if do |k, v| - v.empty? - end + begin + locks = MySQLMutex.active_locks + locks.delete_if do |k, v| + v.empty? + end - if locks.size > 0 - if defined?(Rails) - Rails.logger.error("MySQLMutex: Locks still active! - #{locks.inspect}") + if locks.size > 0 + if defined?(Rails) + Rails.logger.error("MySQLMutex: Locks still active! - #{locks.inspect}") + else + STDERR.puts("MySQLMutex: Locks still active! - #{locks.inspect}") + end else - STDERR.puts("MySQLMutex: Locks still active! - #{locks.inspect}") + if defined?(Rails) + Rails.logger.debug("MySQLMutex: All locks released.") + else + STDERR.puts("MySQLMutex: All locks released.") + end end - else + rescue => err if defined?(Rails) - Rails.logger.debug("MySQLMutex: All locks released.") + Rails.logger.error("MySQLMutex: #{err.message}") else - STDERR.puts("MySQLMutex: All locks released.") + STDERR.puts("MySQLMutex: #{err.message}") end end end