diff options
Diffstat (limited to 'app/services/groups/import_export/import_service.rb')
-rw-r--r-- | app/services/groups/import_export/import_service.rb | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/app/services/groups/import_export/import_service.rb b/app/services/groups/import_export/import_service.rb index 6f692c98c38..a5c776f8fc2 100644 --- a/app/services/groups/import_export/import_service.rb +++ b/app/services/groups/import_export/import_service.rb @@ -9,6 +9,20 @@ module Groups @group = group @current_user = user @shared = Gitlab::ImportExport::Shared.new(@group) + @logger = Gitlab::Import::Logger.build + end + + def async_execute + group_import_state = GroupImportState.safe_find_or_create_by!(group: group) + jid = GroupImportWorker.perform_async(current_user.id, group.id) + + if jid.present? + group_import_state.update!(jid: jid) + else + group_import_state.fail_op('Failed to schedule import job') + + false + end end def execute @@ -21,6 +35,7 @@ module Groups end ensure + remove_base_tmp_dir remove_import_file end @@ -77,7 +92,7 @@ module Groups end def notify_success - @shared.logger.info( + @logger.info( group_id: @group.id, group_name: @group.name, message: 'Group Import/Export: Import succeeded' @@ -85,7 +100,7 @@ module Groups end def notify_error - @shared.logger.error( + @logger.error( group_id: @group.id, group_name: @group.name, message: "Group Import/Export: Errors occurred, see '#{Gitlab::ErrorTracking::Logger.file_name}' for details" @@ -97,6 +112,10 @@ module Groups raise Gitlab::ImportExport::Error.new(@shared.errors.to_sentence) end + + def remove_base_tmp_dir + FileUtils.rm_rf(@shared.base_path) + end end end end |