Просмотр исходного кода

add env var CONFIG_PUBSUB_NCHAN_CHANNEL_ID for nchan channel ID

Yuki Takei 5 лет назад
Родитель
Сommit
11d0663d4f
2 измененных файлов с 12 добавлено и 3 удалено
  1. 6 0
      src/server/service/config-loader.js
  2. 6 3
      src/server/service/config-pubsub/nchan.js

+ 6 - 0
src/server/service/config-loader.js

@@ -143,6 +143,12 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    TYPES.STRING,
     default: '/pubsub',
   },
+  CONFIG_PUBSUB_NCHAN_CHANNEL_ID: {
+    ns:      'crowi',
+    key:     'configPubsub:nchan:channelId',
+    type:    TYPES.STRING,
+    default: null,
+  },
   MAX_FILE_SIZE: {
     ns:      'crowi',
     key:     'app:maxFileSize',

+ 6 - 3
src/server/service/config-pubsub/nchan.js

@@ -61,6 +61,7 @@ class NchanDelegator extends ConfigPubsubDelegator {
     // connect
     this.isConnecting = true;
     const url = this.constructUrl(this.subscribePath).toString();
+    logger.debug(`Subscribe to ${url}`);
     this.client.connect(url.toString());
   }
 
@@ -70,9 +71,10 @@ class NchanDelegator extends ConfigPubsubDelegator {
   async publish(configPubsubMessage) {
     await super.publish(configPubsubMessage);
 
-    logger.debug('Publish message', configPubsubMessage);
-
     const url = this.constructUrl(this.publishPath).toString();
+
+    logger.debug('Publish message', configPubsubMessage, `to ${url}`);
+
     return axios.post(url, JSON.stringify(configPubsubMessage));
   }
 
@@ -187,6 +189,7 @@ module.exports = function(crowi) {
 
   const publishPath = configManager.getConfig('crowi', 'configPubsub:nchan:publishPath');
   const subscribePath = configManager.getConfig('crowi', 'configPubsub:nchan:subscribePath');
+  const channelId = configManager.getConfig('crowi', 'configPubsub:nchan:channelId');
 
-  return new NchanDelegator(uri, publishPath, subscribePath);
+  return new NchanDelegator(uri, publishPath, subscribePath, channelId);
 };