Explorar el Código

impl getInfoForHalth

Yuki Takei hace 6 años
padre
commit
09ca2c72c2

+ 1 - 1
src/server/routes/apiv3/healthcheck.js

@@ -119,7 +119,7 @@ module.exports = (crowi) => {
     const { searchService } = crowi;
     const { searchService } = crowi;
     if (searchService.isConfigured) {
     if (searchService.isConfigured) {
       try {
       try {
-        info.searchInfo = await searchService.getInfo();
+        info.searchInfo = await searchService.getInfoForHealth();
       }
       }
       catch (err) {
       catch (err) {
         errors.push(new ErrorV3(`The Search Service is not connectable - ${err.message}`, 'healthcheck-search-unhealthy', err.stack));
         errors.push(new ErrorV3(`The Search Service is not connectable - ${err.message}`, 'healthcheck-search-unhealthy', err.stack));

+ 4 - 0
src/server/service/search-delegator/elasticsearch.js

@@ -126,6 +126,10 @@ class ElasticsearchDelegator {
     return { esVersion, esNodeInfos };
     return { esVersion, esNodeInfos };
   }
   }
 
 
+  async getInfoForHealth() {
+    return this.client.cluster.health();
+  }
+
   /**
   /**
    * Return information for Admin Full Text Search Management page
    * Return information for Admin Full Text Search Management page
    */
    */

+ 14 - 4
src/server/service/search.js

@@ -80,18 +80,27 @@ class SearchService {
   }
   }
 
 
   async getInfo() {
   async getInfo() {
+    try {
+      return await this.delegator.getInfo();
+    }
+    catch (err) {
+      logger.error(err);
+      throw err;
+    }
+  }
 
 
+  async getInfoForHealth() {
     try {
     try {
-      const result = await this.delegator.getInfo();
+      const result = await this.delegator.getInfoForHealth();
 
 
-      this.isErrorOccuredOnGettingInfo = false;
+      this.isErrorOccuredOnHealthcheck = false;
       return result;
       return result;
     }
     }
     catch (err) {
     catch (err) {
       logger.error(err);
       logger.error(err);
 
 
-      // switch error flag, `isReachable` to be `false`
-      this.isErrorOccuredOnGettingInfo = true;
+      // switch error flag, `isErrorOccuredOnHealthcheck` to be `false`
+      this.isErrorOccuredOnHealthcheck = true;
       throw err;
       throw err;
     }
     }
   }
   }
@@ -110,6 +119,7 @@ class SearchService {
 
 
   async searchKeyword(keyword, user, userGroups, searchOpts) {
   async searchKeyword(keyword, user, userGroups, searchOpts) {
     try {
     try {
+      throw new Error('hoge');
       return await this.delegator.searchKeyword(keyword, user, userGroups, searchOpts);
       return await this.delegator.searchKeyword(keyword, user, userGroups, searchOpts);
     }
     }
     catch (err) {
     catch (err) {