Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
c211d904
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,发现更多精彩内容 >>
提交
c211d904
编写于
8月 20, 2010
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Just add connection management middleware if running in a concurrent environment."
This reverts commit
6b29dc87
.
上级
3cd9627b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
19 deletion
+7
-19
activerecord/lib/active_record/railtie.rb
activerecord/lib/active_record/railtie.rb
+5
-8
railties/test/application/initializers/frameworks_test.rb
railties/test/application/initializers/frameworks_test.rb
+1
-11
railties/test/application/middleware_test.rb
railties/test/application/middleware_test.rb
+1
-0
未找到文件。
activerecord/lib/active_record/railtie.rb
浏览文件 @
c211d904
...
@@ -16,7 +16,11 @@ class Railtie < Rails::Railtie
...
@@ -16,7 +16,11 @@ class Railtie < Rails::Railtie
config
.
generators
.
orm
:active_record
,
:migration
=>
true
,
config
.
generators
.
orm
:active_record
,
:migration
=>
true
,
:timestamps
=>
true
:timestamps
=>
true
config
.
app_middleware
.
insert_after
"::ActionDispatch::Callbacks"
,
"ActiveRecord::QueryCache"
config
.
app_middleware
.
insert_after
"::ActionDispatch::Callbacks"
,
"ActiveRecord::QueryCache"
config
.
app_middleware
.
insert_after
"::ActionDispatch::Callbacks"
,
"ActiveRecord::ConnectionAdapters::ConnectionManagement"
rake_tasks
do
rake_tasks
do
load
"active_record/railties/databases.rake"
load
"active_record/railties/databases.rake"
...
@@ -74,13 +78,6 @@ class Railtie < Rails::Railtie
...
@@ -74,13 +78,6 @@ class Railtie < Rails::Railtie
end
end
end
end
initializer
"active_record.add_concurrency_middleware"
do
|
app
|
if
app
.
config
.
allow_concurrency
app
.
config
.
middleware
.
insert_after
"::ActionDispatch::Callbacks"
,
"ActiveRecord::ConnectionAdapters::ConnectionManagement"
end
end
config
.
after_initialize
do
config
.
after_initialize
do
ActiveSupport
.
on_load
(
:active_record
)
do
ActiveSupport
.
on_load
(
:active_record
)
do
instantiate_observers
instantiate_observers
...
...
railties/test/application/initializers/frameworks_test.rb
浏览文件 @
c211d904
...
@@ -98,17 +98,7 @@ def notify
...
@@ -98,17 +98,7 @@ def notify
require
"
#{
app_path
}
/config/environment"
require
"
#{
app_path
}
/config/environment"
expects
=
[
ActiveRecord
::
QueryCache
,
ActiveRecord
::
SessionStore
]
expects
=
[
ActiveRecord
::
ConnectionAdapters
::
ConnectionManagement
,
ActiveRecord
::
QueryCache
,
ActiveRecord
::
SessionStore
]
middleware
=
Rails
.
application
.
config
.
middleware
.
map
{
|
m
|
m
.
klass
}
assert_equal
expects
,
middleware
&
expects
end
test
"database middleware initializes when allow concurrency is true"
do
add_to_config
"config.threadsafe!"
require
"
#{
app_path
}
/config/environment"
expects
=
[
ActiveRecord
::
ConnectionAdapters
::
ConnectionManagement
,
ActiveRecord
::
QueryCache
]
middleware
=
Rails
.
application
.
config
.
middleware
.
map
{
|
m
|
m
.
klass
}
middleware
=
Rails
.
application
.
config
.
middleware
.
map
{
|
m
|
m
.
klass
}
assert_equal
expects
,
middleware
&
expects
assert_equal
expects
,
middleware
&
expects
end
end
...
...
railties/test/application/middleware_test.rb
浏览文件 @
c211d904
...
@@ -28,6 +28,7 @@ def app
...
@@ -28,6 +28,7 @@ def app
"ActionDispatch::RemoteIp"
,
"ActionDispatch::RemoteIp"
,
"Rack::Sendfile"
,
"Rack::Sendfile"
,
"ActionDispatch::Callbacks"
,
"ActionDispatch::Callbacks"
,
"ActiveRecord::ConnectionAdapters::ConnectionManagement"
,
"ActiveRecord::QueryCache"
,
"ActiveRecord::QueryCache"
,
"ActionDispatch::Cookies"
,
"ActionDispatch::Cookies"
,
"ActionDispatch::Session::CookieStore"
,
"ActionDispatch::Session::CookieStore"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录