Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e4dc3035
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,发现更多精彩内容 >>
提交
e4dc3035
编写于
2月 08, 2014
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafe
Reaper has access to threadsafe active? call
上级
f99b254e
02a3c0e7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
4 deletion
+15
-4
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
...ve_record/connection_adapters/abstract/connection_pool.rb
+1
-1
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
...lib/active_record/connection_adapters/abstract_adapter.rb
+6
-0
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
...b/active_record/connection_adapters/postgresql_adapter.rb
+6
-1
activerecord/test/cases/connection_pool_test.rb
activerecord/test/cases/connection_pool_test.rb
+1
-1
activerecord/test/cases/reaper_test.rb
activerecord/test/cases/reaper_test.rb
+1
-1
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
浏览文件 @
e4dc3035
...
...
@@ -393,7 +393,7 @@ def reap
synchronize
do
stale
=
Time
.
now
-
@dead_connection_timeout
connections
.
dup
.
each
do
|
conn
|
if
conn
.
in_use?
&&
stale
>
conn
.
last_use
&&
!
conn
.
active?
if
conn
.
in_use?
&&
stale
>
conn
.
last_use
&&
!
conn
.
active
_threadsafe
?
remove
conn
end
end
...
...
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
浏览文件 @
e4dc3035
...
...
@@ -262,6 +262,12 @@ def disable_referential_integrity
def
active?
end
# Adapter should redefine this if it needs a threadsafe way to approximate
# if the connection is active
def
active_threadsafe?
active?
end
# Disconnects from the database if already connected, and establishes a
# new connection with the database. Implementors should call super if they
# override the default implementation.
...
...
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
浏览文件 @
e4dc3035
...
...
@@ -586,11 +586,16 @@ def clear_cache!
# Is this connection alive and ready for queries?
def
active?
@connection
.
connect_poll
!=
PG
::
PGRES_POLLING_FAILED
@connection
.
query
'SELECT 1'
true
rescue
PGError
false
end
def
active_threadsafe?
@connection
.
connect_poll
!=
PG
::
PGRES_POLLING_FAILED
end
# Close then reopen the connection.
def
reconnect!
super
...
...
activerecord/test/cases/connection_pool_test.rb
浏览文件 @
e4dc3035
...
...
@@ -142,7 +142,7 @@ def test_reap_inactive
connections
=
@pool
.
connections
.
dup
connections
.
each
do
|
conn
|
conn
.
extend
(
Module
.
new
{
def
active?
;
false
;
end
;
})
conn
.
extend
(
Module
.
new
{
def
active
_threadsafe
?
;
false
;
end
;
})
end
@pool
.
reap
...
...
activerecord/test/cases/reaper_test.rb
浏览文件 @
e4dc3035
...
...
@@ -69,7 +69,7 @@ def test_connection_pool_starts_reaper
conn
=
pool
.
checkout
count
=
pool
.
connections
.
length
conn
.
extend
(
Module
.
new
{
def
active?
;
false
;
end
;
})
conn
.
extend
(
Module
.
new
{
def
active
_threadsafe
?
;
false
;
end
;
})
while
count
==
pool
.
connections
.
length
Thread
.
pass
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录