Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
dc2e291a
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,发现更多精彩内容 >>
提交
dc2e291a
编写于
1月 12, 2010
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move AR logging responsibilities to ActiveRecord::Railties::Subscriber.
上级
fe3ceabe
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
35 addition
and
46 deletion
+35
-46
activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
...active_record/connection_adapters/abstract/query_cache.rb
+2
-1
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
...lib/active_record/connection_adapters/abstract_adapter.rb
+1
-25
activerecord/lib/active_record/railtie.rb
activerecord/lib/active_record/railtie.rb
+4
-8
activerecord/lib/active_record/railties/subscriber.rb
activerecord/lib/active_record/railties/subscriber.rb
+27
-0
activerecord/test/cases/pooled_connections_test.rb
activerecord/test/cases/pooled_connections_test.rb
+1
-12
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
浏览文件 @
dc2e291a
...
...
@@ -75,7 +75,8 @@ def columns_with_query_cache(*args)
def
cache_sql
(
sql
)
result
=
if
@query_cache
.
has_key?
(
sql
)
log_info
(
sql
,
"CACHE"
,
0.0
)
ActiveSupport
::
Notifications
.
instrument
(
"active_record.sql"
,
:sql
=>
sql
,
:name
=>
"CACHE"
,
:connection_id
=>
self
.
object_id
)
@query_cache
[
sql
]
else
@query_cache
[
sql
]
=
yield
...
...
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
浏览文件 @
dc2e291a
...
...
@@ -190,13 +190,6 @@ def current_savepoint_name
"active_record_
#{
open_transactions
}
"
end
def
log_info
(
sql
,
name
,
ms
)
if
@logger
&&
@logger
.
debug?
name
=
'%s (%.1fms)'
%
[
name
,
ms
]
@logger
.
debug
(
format_log_entry
(
name
,
sql
.
squeeze
(
' '
)))
end
end
protected
def
log
(
sql
,
name
)
name
||=
"SQL"
...
...
@@ -208,7 +201,7 @@ def log(sql, name)
result
rescue
Exception
=>
e
message
=
"
#{
e
.
class
.
name
}
:
#{
e
.
message
}
:
#{
sql
}
"
log_info
(
message
,
name
,
0
)
@logger
.
debug
message
if
@logger
raise
translate_exception
(
e
,
message
)
end
...
...
@@ -217,23 +210,6 @@ def translate_exception(e, message)
ActiveRecord
::
StatementInvalid
.
new
(
message
)
end
def
format_log_entry
(
message
,
dump
=
nil
)
if
ActiveRecord
::
Base
.
colorize_logging
if
@@row_even
@@row_even
=
false
message_color
,
dump_color
=
"4;36;1"
,
"0;1"
else
@@row_even
=
true
message_color
,
dump_color
=
"4;35;1"
,
"0"
end
log_entry
=
"
\e
[
#{
message_color
}
m
#{
message
}
\e
[0m "
log_entry
<<
"
\e
[
#{
dump_color
}
m%
#{
String
===
dump
?
's'
:
'p'
}
\e
[0m"
%
dump
if
dump
log_entry
else
"%s %s"
%
[
message
,
dump
]
end
end
end
end
end
activerecord/lib/active_record/railtie.rb
浏览文件 @
dc2e291a
...
...
@@ -14,6 +14,10 @@ class Railtie < Rails::Railtie
load
"active_record/railties/databases.rake"
end
# TODO If we require the wrong file, the error never comes up.
require
"active_record/railties/subscriber"
subscriber
ActiveRecord
::
Railties
::
Subscriber
.
new
initializer
"active_record.set_configs"
do
|
app
|
app
.
config
.
active_record
.
each
do
|
k
,
v
|
ActiveRecord
::
Base
.
send
"
#{
k
}
="
,
v
...
...
@@ -59,14 +63,6 @@ class Railtie < Rails::Railtie
ActiveRecord
::
Base
.
logger
||=
::
Rails
.
logger
end
initializer
"active_record.notifications"
do
require
'active_support/notifications'
ActiveSupport
::
Notifications
.
subscribe
(
"active_record.sql"
)
do
|
name
,
before
,
after
,
instrumenter_id
,
payload
|
payload
[
:connection
].
log_info
(
payload
[
:sql
],
payload
[
:name
],
(
after
-
before
)
*
1000
)
end
end
initializer
"active_record.i18n_deprecation"
do
require
'active_support/i18n'
...
...
activerecord/lib/active_record/railties/subscriber.rb
0 → 100644
浏览文件 @
dc2e291a
module
ActiveRecord
module
Railties
class
Subscriber
<
Rails
::
Subscriber
def
sql
(
event
)
name
=
'%s (%.1fms)'
%
[
event
.
payload
[
:name
],
event
.
duration
]
sql
=
event
.
payload
[
:sql
].
squeeze
(
' '
)
if
odd?
name
=
color
(
name
,
:cyan
,
true
)
sql
=
color
(
sql
,
nil
,
true
)
else
name
=
color
(
name
,
:magenta
,
true
)
end
debug
"
#{
name
}
#{
sql
}
"
end
def
odd?
@odd_or_even
=
!
@odd_or_even
end
def
logger
ActiveRecord
::
Base
.
logger
end
end
end
end
\ No newline at end of file
activerecord/test/cases/pooled_connections_test.rb
浏览文件 @
dc2e291a
...
...
@@ -137,15 +137,4 @@ def test_connection_pool_callbacks
def
add_record
(
name
)
ActiveRecord
::
Base
.
connection_pool
.
with_connection
{
Project
.
create!
:name
=>
name
}
end
end
unless
%w(FrontBase)
.
include?
ActiveRecord
::
Base
.
connection
.
adapter_name
class
AllowConcurrencyDeprecatedTest
<
ActiveRecord
::
TestCase
def
test_allow_concurrency_is_deprecated
assert_deprecated
(
'ActiveRecord::Base.allow_concurrency'
)
do
ActiveRecord
::
Base
.
allow_concurrency
end
assert_deprecated
(
'ActiveRecord::Base.allow_concurrency='
)
do
ActiveRecord
::
Base
.
allow_concurrency
=
true
end
end
end
end
unless
%w(FrontBase)
.
include?
ActiveRecord
::
Base
.
connection
.
adapter_name
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录