Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
60b55bac
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,发现更多精彩内容 >>
提交
60b55bac
编写于
5月 22, 2011
作者:
F
Frederick Cheung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Take into account time spent in AR even if a redirect occurs or if it is after the render
上级
4ee7d923
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
3 deletion
+31
-3
actionpack/test/activerecord/controller_runtime_test.rb
actionpack/test/activerecord/controller_runtime_test.rb
+26
-0
activerecord/lib/active_record/railties/controller_runtime.rb
...verecord/lib/active_record/railties/controller_runtime.rb
+5
-3
未找到文件。
actionpack/test/activerecord/controller_runtime_test.rb
浏览文件 @
60b55bac
...
...
@@ -15,6 +15,17 @@ def show
def
zero
render
:inline
=>
"Zero DB runtime"
end
def
redirect
Project
.
all
redirect_to
:action
=>
'show'
end
def
db_after_render
render
:inline
=>
"Hello world"
Project
.
all
ActiveRecord
::
LogSubscriber
.
runtime
+=
100
end
end
include
ActiveSupport
::
LogSubscriber
::
TestHelper
...
...
@@ -52,4 +63,19 @@ def test_runtime_reset_before_requests
assert_equal
2
,
@logger
.
logged
(
:info
).
size
assert_match
(
/\(Views: [\d.]+ms \| ActiveRecord: 0.0ms\)/
,
@logger
.
logged
(
:info
)[
1
])
end
def
test_log_with_active_record_when_redirecting
get
:redirect
wait
assert_equal
3
,
@logger
.
logged
(
:info
).
size
assert_match
(
/\(ActiveRecord: [\d.]+ms\)/
,
@logger
.
logged
(
:info
)[
2
])
end
def
test_include_time_query_time_after_rendering
get
:db_after_render
wait
assert_equal
2
,
@logger
.
logged
(
:info
).
size
assert_match
(
/\(Views: [\d.]+ms \| ActiveRecord: ([1-9][\d.]+)ms\)/
,
@logger
.
logged
(
:info
)[
1
])
end
end
activerecord/lib/active_record/railties/controller_runtime.rb
浏览文件 @
60b55bac
...
...
@@ -23,8 +23,8 @@ def cleanup_view_runtime
db_rt_before_render
=
ActiveRecord
::
LogSubscriber
.
reset_runtime
runtime
=
super
db_rt_after_render
=
ActiveRecord
::
LogSubscriber
.
reset_runtime
self
.
db_runtime
=
db_rt_before_render
+
db_
rt_after_render
runtime
-
db_
rt_after
_render
self
.
db_runtime
=
db_rt_before_render
+
db_
during_render
runtime
-
db_
during
_render
else
super
end
...
...
@@ -32,7 +32,9 @@ def cleanup_view_runtime
def
append_info_to_payload
(
payload
)
super
payload
[
:db_runtime
]
=
db_runtime
if
ActiveRecord
::
Base
.
connected?
payload
[
:db_runtime
]
=
(
db_runtime
||
0
)
+
ActiveRecord
::
LogSubscriber
.
reset_runtime
end
end
module
ClassMethods
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录