Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0210c44c
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
0210c44c
编写于
3月 12, 2012
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make sure connections returned after close are marked as in_use
上级
7f40b9cd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
4 deletion
+27
-4
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
...ve_record/connection_adapters/abstract/connection_pool.rb
+17
-4
activerecord/test/cases/connection_pool_test.rb
activerecord/test/cases/connection_pool_test.rb
+10
-0
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
浏览文件 @
0210c44c
...
...
@@ -235,6 +235,8 @@ def checkin(conn)
conn
.
run_callbacks
:checkin
do
conn
.
expire
end
release
conn
end
end
...
...
@@ -246,10 +248,7 @@ def remove(conn)
# FIXME: we might want to store the key on the connection so that removing
# from the reserved hash will be a little easier.
thread_id
=
@reserved_connections
.
keys
.
find
{
|
k
|
@reserved_connections
[
k
]
==
conn
}
@reserved_connections
.
delete
thread_id
if
thread_id
release
conn
end
end
...
...
@@ -267,6 +266,20 @@ def reap
private
def
release
(
conn
)
thread_id
=
nil
if
@reserved_connections
[
current_connection_id
]
==
conn
thread_id
=
current_connection_id
else
thread_id
=
@reserved_connections
.
keys
.
find
{
|
k
|
@reserved_connections
[
k
]
==
conn
}
end
@reserved_connections
.
delete
thread_id
if
thread_id
end
def
new_connection
ActiveRecord
::
Base
.
send
(
spec
.
adapter_method
,
spec
.
config
)
end
...
...
activerecord/test/cases/connection_pool_test.rb
浏览文件 @
0210c44c
...
...
@@ -31,6 +31,16 @@ def active_connections(pool)
pool
.
connections
.
find_all
(
&
:in_use?
)
end
def
test_checkout_after_close
connection
=
pool
.
connection
assert
connection
.
in_use?
connection
.
close
assert
!
connection
.
in_use?
assert
pool
.
connection
.
in_use?
end
def
test_released_connection_moves_between_threads
thread_conn
=
nil
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录