Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0aa8249e
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,发现更多精彩内容 >>
提交
0aa8249e
编写于
7月 06, 2017
作者:
T
Tiago Botelho
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactors Project Destroy service and worker code
上级
3491b19a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
21 deletion
+28
-21
app/services/projects/destroy_service.rb
app/services/projects/destroy_service.rb
+26
-16
app/workers/project_destroy_worker.rb
app/workers/project_destroy_worker.rb
+2
-5
未找到文件。
app/services/projects/destroy_service.rb
浏览文件 @
0aa8249e
...
@@ -25,27 +25,15 @@ module Projects
...
@@ -25,27 +25,15 @@ module Projects
Projects
::
UnlinkForkService
.
new
(
project
,
current_user
).
execute
Projects
::
UnlinkForkService
.
new
(
project
,
current_user
).
execute
Project
.
transaction
do
attempt_destroy_transaction
(
project
,
repo_path
,
wiki_path
)
unless
remove_legacy_registry_tags
raise_error
(
'Failed to remove some tags in project container registry. Please try again or contact administrator.'
)
end
unless
remove_repository
(
repo_path
)
raise_error
(
'Failed to remove project repository. Please try again or contact administrator.'
)
end
unless
remove_repository
(
wiki_path
)
raise_error
(
'Failed to remove wiki repository. Please try again or contact administrator.'
)
end
project
.
team
.
truncate
project
.
destroy!
end
system_hook_service
.
execute_hooks_for
(
project
,
:destroy
)
system_hook_service
.
execute_hooks_for
(
project
,
:destroy
)
log_info
(
"Project
\"
#{
project
.
full_path
}
\"
was removed"
)
log_info
(
"Project
\"
#{
project
.
full_path
}
\"
was removed"
)
true
true
rescue
Projects
::
DestroyService
::
DestroyError
=>
error
Rails
.
logger
.
error
(
"Deletion failed on
#{
project
.
full_path
}
with the following message:
#{
error
.
message
}
"
)
false
end
end
private
private
...
@@ -71,6 +59,28 @@ module Projects
...
@@ -71,6 +59,28 @@ module Projects
end
end
end
end
def
attempt_destroy_transaction
(
project
,
repo_path
,
wiki_path
)
Project
.
transaction
do
unless
remove_legacy_registry_tags
raise_error
(
'Failed to remove some tags in project container registry. Please try again or contact administrator.'
)
end
unless
remove_repository
(
repo_path
)
raise_error
(
'Failed to remove project repository. Please try again or contact administrator.'
)
end
unless
remove_repository
(
wiki_path
)
raise_error
(
'Failed to remove wiki repository. Please try again or contact administrator.'
)
end
project
.
team
.
truncate
project
.
destroy!
end
rescue
Exception
=>
error
# rubocop:disable Lint/RescueException
project
.
update_attributes
(
delete_error:
error
.
message
,
pending_delete:
false
)
raise
end
##
##
# This method makes sure that we correctly remove registry tags
# This method makes sure that we correctly remove registry tags
# for legacy image repository (when repository path equals project path).
# for legacy image repository (when repository path equals project path).
...
...
app/workers/project_destroy_worker.rb
浏览文件 @
0aa8249e
...
@@ -7,10 +7,7 @@ class ProjectDestroyWorker
...
@@ -7,10 +7,7 @@ class ProjectDestroyWorker
user
=
User
.
find
(
user_id
)
user
=
User
.
find
(
user_id
)
::
Projects
::
DestroyService
.
new
(
project
,
user
,
params
.
symbolize_keys
).
execute
::
Projects
::
DestroyService
.
new
(
project
,
user
,
params
.
symbolize_keys
).
execute
rescue
Exception
=>
error
# rubocop:disable Lint/RescueException
rescue
ActiveRecord
::
RecordNotFound
=>
error
project
&
.
update_attributes
(
delete_error:
error
.
message
,
pending_delete:
false
)
logger
.
error
(
"Failed to delete project
#{
project
.
path_with_namespace
}
(
#{
project
.
id
}
):
#{
error
.
message
}
"
)
Rails
.
logger
.
error
(
"Deletion failed on
#{
project
&
.
full_path
}
with the following message:
#{
error
.
message
}
"
)
raise
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录