utsushiiro 7 лет назад
Родитель
Сommit
b612d9d03e
2 измененных файлов с 11 добавлено и 3 удалено
  1. 7 1
      src/server/service/config-loader.js
  2. 4 2
      src/server/service/config-manager.js

+ 7 - 1
src/server/service/config-loader.js

@@ -1,4 +1,4 @@
-const debug = require('debug')('growi:models:config');
+const debug = require('debug')('growi:service:ConfigLoader');
 
 
 /**
 /**
  * The following env vars ignored because these are used before the configuration setup
  * The following env vars ignored because these are used before the configuration setup
@@ -70,6 +70,9 @@ class ConfigLoader {
       }
       }
       config[doc.ns][doc.key] = JSON.parse(doc.value);
       config[doc.ns][doc.key] = JSON.parse(doc.value);
     }
     }
+
+    debug('ConfigLoader#loadFromDB', config);
+
     return config;
     return config;
   }
   }
 
 
@@ -79,6 +82,9 @@ class ConfigLoader {
     for (const ENV_VAR_NAME of Object.keys(ENV_VAR_NAME_TO_CONFIG_KEY_MAP)) {
     for (const ENV_VAR_NAME of Object.keys(ENV_VAR_NAME_TO_CONFIG_KEY_MAP)) {
       config.crowi[ENV_VAR_NAME_TO_CONFIG_KEY_MAP[ENV_VAR_NAME]] = process.env[ENV_VAR_NAME];
       config.crowi[ENV_VAR_NAME_TO_CONFIG_KEY_MAP[ENV_VAR_NAME]] = process.env[ENV_VAR_NAME];
     }
     }
+
+    debug('ConfigLoader#loadFromEnvVars', config);
+
     return config;
     return config;
   }
   }
 }
 }

+ 4 - 2
src/server/service/config-manager.js

@@ -1,5 +1,5 @@
 const ConfigLoader = require('../service/config-loader')
 const ConfigLoader = require('../service/config-loader')
-  , debug = require('debug')('growi:models:config');
+  , debug = require('debug')('growi:service:ConfigManager');
 
 
 class ConfigManager {
 class ConfigManager {
 
 
@@ -11,6 +11,8 @@ class ConfigManager {
 
 
   async loadConfigs() {
   async loadConfigs() {
     this.configObject = await this.configLoader.load();
     this.configObject = await this.configLoader.load();
+
+    debug('ConfigManager#loadConfigs', this.configObject);
   }
   }
 
 
   getConfig(namespace, key) {
   getConfig(namespace, key) {
@@ -33,7 +35,7 @@ class ConfigManager {
         { ns: config.ns, key: config.key, value: JSON.stringify(config.value) },
         { ns: config.ns, key: config.key, value: JSON.stringify(config.value) },
         { upsert: true, },
         { upsert: true, },
         function(err, config) {
         function(err, config) {
-          debug('Config.findAndUpdate', err, config);
+          debug('ConfigManager#updateConfigs', err, config);
         });
         });
     }
     }