Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3899d07f
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3899d07f
编写于
8月 03, 2017
作者:
B
Bob Van Landuyt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move hostname to Gitlab::Environment
上级
0fa94a0d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
4 deletion
+10
-4
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+0
-1
lib/gitlab/environment.rb
lib/gitlab/environment.rb
+7
-0
lib/gitlab/git/storage/circuit_breaker.rb
lib/gitlab/git/storage/circuit_breaker.rb
+1
-1
spec/features/admin/admin_health_check_spec.rb
spec/features/admin/admin_health_check_spec.rb
+1
-1
spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
+1
-1
未找到文件。
config/initializers/1_settings.rb
浏览文件 @
3899d07f
...
...
@@ -222,7 +222,6 @@ Settings.gitlab['default_branch_protection'] ||= 2
Settings
.
gitlab
[
'default_can_create_group'
]
=
true
if
Settings
.
gitlab
[
'default_can_create_group'
].
nil?
Settings
.
gitlab
[
'host'
]
||=
ENV
[
'GITLAB_HOST'
]
||
'localhost'
Settings
.
gitlab
[
'ssh_host'
]
||=
Settings
.
gitlab
.
host
Settings
.
gitlab
[
'hostname'
]
||=
ENV
[
'HOSTNAME'
]
||
Socket
.
gethostname
Settings
.
gitlab
[
'https'
]
=
false
if
Settings
.
gitlab
[
'https'
].
nil?
Settings
.
gitlab
[
'port'
]
||=
ENV
[
'GITLAB_PORT'
]
||
(
Settings
.
gitlab
.
https
?
443
:
80
)
Settings
.
gitlab
[
'relative_url_root'
]
||=
ENV
[
'RAILS_RELATIVE_URL_ROOT'
]
||
''
...
...
lib/gitlab/environment.rb
0 → 100644
浏览文件 @
3899d07f
module
Gitlab
module
Environment
def
self
.
hostname
@hostname
||=
ENV
[
'HOSTNAME'
]
||
Socket
.
gethostname
end
end
end
lib/gitlab/git/storage/circuit_breaker.rb
浏览文件 @
3899d07f
...
...
@@ -31,7 +31,7 @@ module Gitlab
cached_circuitbreakers
[
storage
]
end
def
initialize
(
storage
,
hostname
=
Gitlab
.
config
.
gitlab
.
hostname
)
def
initialize
(
storage
,
hostname
=
Gitlab
::
Environment
.
hostname
)
@storage
=
storage
@hostname
=
hostname
...
...
spec/features/admin/admin_health_check_spec.rb
浏览文件 @
3899d07f
...
...
@@ -64,7 +64,7 @@ feature "Admin Health Check", feature: true, broken_storage: true do
end
it
'shows storage failure information'
do
hostname
=
Gitlab
.
config
.
gitlab
.
hostname
hostname
=
Gitlab
::
Environment
.
hostname
expect
(
page
).
to
have_content
(
'broken: failed storage access attempt on host:'
)
expect
(
page
).
to
have_content
(
"
#{
hostname
}
: 1 of 10 failures."
)
...
...
spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
浏览文件 @
3899d07f
...
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
Git
::
Storage
::
CircuitBreaker
,
clean_gitlab_redis_shared_state:
true
,
broken_storage:
true
do
let
(
:circuit_breaker
)
{
described_class
.
new
(
'default'
)
}
let
(
:hostname
)
{
Gitlab
.
config
.
gitlab
.
hostname
}
let
(
:hostname
)
{
Gitlab
::
Environment
.
hostname
}
let
(
:cache_key
)
{
"storage_accessible:default:
#{
hostname
}
"
}
def
value_from_redis
(
name
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录