Skip to content
This repository has been archived by the owner on Jan 1, 2024. It is now read-only.

Fix hung passenger processes #66

Merged
merged 1 commit into from Aug 24, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/vanity/adapters/redis_adapter.rb
Expand Up @@ -28,7 +28,7 @@ def active?
def disconnect!
if redis
begin
redis.quit
redis.client.disconnect
rescue Exception => e
warn("Error while disconnecting from redis: #{e.message}")
end
Expand Down
2 changes: 1 addition & 1 deletion test/adapters/redis_adapter_test.rb
Expand Up @@ -6,7 +6,7 @@ def test_warn_on_disconnect_error
assert_nothing_raised do
Redis.any_instance.stubs(:connect!)
mocked_redis = stub("Redis")
mocked_redis.expects(:quit).raises(RuntimeError)
mocked_redis.expects(:client).raises(RuntimeError)
redis_adapter = Vanity::Adapters::RedisAdapter.new({})
redis_adapter.expects(:warn).with("Error while disconnecting from redis: RuntimeError")
redis_adapter.stubs(:redis).returns(mocked_redis)
Expand Down