Yuki Takei 4 лет назад
Родитель
Сommit
a78d68fa45

+ 2 - 1
packages/app/src/server/routes/apiv3/admin-home.js

@@ -1,6 +1,7 @@
+import ConfigLoader from '../../service/config-loader';
+
 const express = require('express');
 const express = require('express');
 const PluginUtils = require('../../plugins/plugin-utils');
 const PluginUtils = require('../../plugins/plugin-utils');
-const ConfigLoader = require('../../service/config-loader');
 
 
 const pluginUtils = new PluginUtils();
 const pluginUtils = new PluginUtils();
 
 

+ 3 - 2
packages/app/src/server/service/export.js

@@ -1,6 +1,8 @@
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
 import { toArrayIfNot } from '~/utils/array-utils';
 import { toArrayIfNot } from '~/utils/array-utils';
 
 
+import ConfigLoader from './config-loader';
+
 const logger = loggerFactory('growi:services:ExportService'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:services:ExportService'); // eslint-disable-line no-unused-vars
 
 
 const fs = require('fs');
 const fs = require('fs');
@@ -9,7 +11,6 @@ const mongoose = require('mongoose');
 const { Transform } = require('stream');
 const { Transform } = require('stream');
 const streamToPromise = require('stream-to-promise');
 const streamToPromise = require('stream-to-promise');
 const archiver = require('archiver');
 const archiver = require('archiver');
-const ConfigLoader = require('../service/config-loader');
 
 
 const CollectionProgressingStatus = require('../models/vo/collection-progressing-status');
 const CollectionProgressingStatus = require('../models/vo/collection-progressing-status');
 
 
@@ -91,7 +92,7 @@ class ExportService {
       url: this.appService.getSiteUrl(),
       url: this.appService.getSiteUrl(),
       passwordSeed,
       passwordSeed,
       exportedAt: new Date(),
       exportedAt: new Date(),
-      envVars: ConfigLoader.getEnvVarsForDisplay(),
+      envVars: await ConfigLoader.getEnvVarsForDisplay(),
     };
     };
 
 
     writeStream.write(JSON.stringify(metaData));
     writeStream.write(JSON.stringify(metaData));