Changeset 3002
- Timestamp:
- 11/13/05 10:32:17 (3 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
r3001 r3002 68 68 end 69 69 rescue Exception => e 70 log_info("#{e.message}: #{sql}", name, 0) 71 reconnect_if_inactive! 72 raise ActiveRecord::StatementInvalid, "#{e.message}: #{sql}" 70 message = "#{e.class.name}: #{e.message}: #{sql}" 71 unless reconnect_if_inactive! 72 message = "(reconnect failed) #{message}" 73 end 74 log_info(message, name, 0) 75 raise ActiveRecord::StatementInvalid, message 73 76 end 74 77 … … 109 112 @@reconnect_success += 1 110 113 @logger.info "#{adapter_name} automatically reconnected. Success rate: #{'%.2f' % self.class.reconnect_success_rate}%" if @logger 114 true 111 115 else 112 116 @@reconnect_failure += 1 113 117 @logger.warn "#{adapter_name} automatic reconnection failed. Success rate: #{'%.2f' % self.class.reconnect_success_rate}%" if @logger 114 raise ActiveRecord::ConnectionFailed118 false 115 119 end 116 120 else