Преглед изворни кода

refactor ConfigPubsubHandlable -> ConfigPubsubMessageHandlable

Yuki Takei пре 5 година
родитељ
комит
f15808fd2f

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

@@ -1,7 +1,7 @@
 const logger = require('@alias/logger')('growi:service:ConfigManager');
 
 const ConfigPubsubMessage = require('../models/vo/config-pubsub-message');
-const ConfigPubsubHandlable = require('./config-pubsub/handlable');
+const ConfigPubsubMessageHandlable = require('./config-pubsub/handlable');
 
 const ConfigLoader = require('./config-loader');
 
@@ -22,7 +22,7 @@ const KEYS_FOR_SAML_USE_ONLY_ENV_OPTION = [
   'security:passport-saml:ABLCRule',
 ];
 
-class ConfigManager extends ConfigPubsubHandlable {
+class ConfigManager extends ConfigPubsubMessageHandlable {
 
   constructor(configModel) {
     super();

+ 1 - 1
src/server/service/config-pubsub/base.js

@@ -26,7 +26,7 @@ class ConfigPubsubDelegator {
 
   /**
    * Add message handler
-   * @param {ConfigPubsubHandlable} handlable
+   * @param {ConfigPubsubMessageHandlable} handlable
    */
   addMessageHandler(handlable) {
     throw new Error('implement this');

+ 2 - 2
src/server/service/config-pubsub/handlable.js

@@ -1,5 +1,5 @@
 // TODO: make interface with TS
-class ConfigPubsubHandlable {
+class ConfigPubsubMessageHandlable {
 
   souldHandleConfigPubsubMessage(configPubsubMessage) {
     throw new Error('implement this');
@@ -11,4 +11,4 @@ class ConfigPubsubHandlable {
 
 }
 
-module.exports = ConfigPubsubHandlable;
+module.exports = ConfigPubsubMessageHandlable;

+ 7 - 0
src/server/service/config-pubsub/nchan.js

@@ -5,6 +5,7 @@ const axios = require('axios');
 const WebSocketClient = require('websocket').client;
 
 const ConfigPubsubMessage = require('../../models/vo/config-pubsub-message');
+const ConfigPubsubMessageHandlable = require('../config-pubsub/handlable');
 const ConfigPubsubDelegator = require('./base');
 
 
@@ -77,6 +78,12 @@ class NchanDelegator extends ConfigPubsubDelegator {
    * @inheritdoc
    */
   addMessageHandler(handlable) {
+    if (!(handlable instanceof ConfigPubsubMessageHandlable)) {
+      logger.warn('Unsupported instance');
+      logger.debug('Unsupported instance: ', handlable);
+      return;
+    }
+
     this.handlableList.push(handlable);
 
     if (this.connection != null) {