FB

src/server/crowi/index.js

@@ -547,15 +547,8 @@ Crowi.prototype.setUpApp = async function() {
  * setup FileUploadService
  */
 Crowi.prototype.setUpFileUpload = async function() {
-  const FileUploadService = require('../service/file-uploader');
-  if (this.fileUploadService == null) {
-    this.fileUploadService = new FileUploadService(this);
-
-    // add as a message handler
-    if (this.s2sMessagingService != null) {
-      this.s2sMessagingService.addMessageHandler(this.fileUploadService);
-    }
-  }
+  // const FileUploadService = require('../service/file-uploader');
+  this.fileUploadService = require('../service/file-uploader')(this);
 };
 
 /**

src/server/service/file-uploader/index.js

@@ -13,7 +13,7 @@ const envToModuleMappings = {
   gcs:     'gcs',
 };
 
-class FileUploadServiceFactory extends S2sMessagingServiceDelegator {
+class FileUploadServiceFactory {
 
   async initialize() {
     this.isFileUploaderSetup = false;
@@ -51,7 +51,7 @@ class FileUploadServiceFactory extends S2sMessagingServiceDelegator {
 
   getUploader(crowi) {
     if (this.uploader == null) {
-      this.initializeDelegator(crowi);
+      this.initializeUploader(crowi);
     }
     return this.uploader;
   }