Explorar o código

refactor: respond attachment upload error

mizozobu %!s(int64=3) %!d(string=hai) anos
pai
achega
db6255e4a5

+ 0 - 1
packages/app/public/static/locales/en_US/admin.json

@@ -1032,7 +1032,6 @@
   },
   "g2g": {
     "transfer_success": "Completed GROWI to GROWI transfer successfully",
-    "error_upload_attachment": "Failed to upload attachment <code>%s</code>",
     "error_generate_growi_archive": "Failed to generate GROWI archive file",
     "error_send_growi_archive": "Failed to send GROWI archive file to new GROWI"
   },

+ 0 - 1
packages/app/public/static/locales/ja_JP/admin.json

@@ -1027,7 +1027,6 @@
   },
   "g2g": {
     "transfer_success": "G2G移行が完了しました",
-    "error_upload_attachment": "添付ファイルのアップロードに失敗しました",
     "error_generate_growi_archive": "GROWI アーカイブファイルの作成に失敗しました",
     "error_send_growi_archive": "GROWI アーカイブファイルの送信に失敗しました"
   },

+ 0 - 1
packages/app/public/static/locales/zh_CN/admin.json

@@ -1027,7 +1027,6 @@
   },
   "g2g": {
     "transfer_success": "Completed GROWI to GROWI transfer successfully",
-    "error_upload_attachment": "Failed to upload attachment <code>%s</code>",
     "error_generate_growi_archive": "Failed to generate GROWI archive file",
     "error_send_growi_archive": "Failed to send GROWI archive file to new GROWI"
   },

+ 14 - 1
packages/app/src/server/service/g2g-transfer.ts

@@ -298,7 +298,8 @@ export class G2GTransferPusherService implements Pusher {
 
   public async transferAttachments(tk: TransferKey): Promise<void> {
     const BATCH_SIZE = 100;
-    const { fileUploadService } = this.crowi;
+    const { fileUploadService, socketIoService } = this.crowi;
+    const socket = socketIoService.getAdminSocket();
     const Attachment = this.crowi.model('Attachment');
     const filesFromNewGrowi = await this.listFilesInStorage(tk);
 
@@ -364,6 +365,12 @@ export class G2GTransferPusherService implements Pusher {
         }
         catch (err) {
           logger.warn(`Error occured when getting Attachment(ID=${attachment.id}), skipping: `, err);
+          socket.emit('admin:g2gError', {
+            message: `Error occured when uploading Attachment(ID=${attachment.id})`,
+            key: `Error occured when uploading Attachment(ID=${attachment.id})`,
+            // TODO: emit error with params
+            // key: 'admin:g2g:error_upload_attachment',
+          });
           continue;
         }
         // post each attachment file data to receiver
@@ -372,6 +379,12 @@ export class G2GTransferPusherService implements Pusher {
         }
         catch (err) {
           logger.error(`Error occured when uploading attachment(ID=${attachment.id})`, err);
+          socket.emit('admin:g2gError', {
+            message: `Error occured when uploading Attachment(ID=${attachment.id})`,
+            key: `Error occured when uploading Attachment(ID=${attachment.id})`,
+            // TODO: emit error with params
+            // key: 'admin:g2g:error_upload_attachment',
+          });
         }
       }
     }