fix: add health check endpoint

EYBlockchain · Jan 14, 2025 · 326b67e · 326b67e
1 parent e7a8da6
commit 326b67e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/release-update.yml b/.github/workflows/release-update.yml
@@ -3,7 +3,7 @@ name: Release updated
 on:
   push:
     branches:
-      - wenxing/updateImages--
+      - wenxing/updateImages
 
 jobs:
   BuildDockerImage:

diff --git a/.github/workflows/timber.yml b/.github/workflows/timber.yml
@@ -3,7 +3,7 @@ name: Timber Development Workflow
 on:
   push:
     branches:
-      - wenxing/updateImages
+      - wenxing/updateImages--
 jobs:
 
   SetupEnvironment:

diff --git a/merkle-tree/src/filter-controller.js b/merkle-tree/src/filter-controller.js
@@ -38,9 +38,9 @@ const newLeafResponseFunction = async (eventObject, args) => {
   logger.debug(`eventname: ${eventName}`);
 
   if (treeId === undefined || treeId === '') {
-    eventParams = config.contracts[contractName].events[eventName].parameters;
+    eventParams = config.contracts['default'].events[eventName].parameters;
   } else {
-    eventParams = config.contracts[contractName].treeId[treeId].events[eventName].parameters;
+    eventParams = config.contracts['default'].treeId[treeId].events[eventName].parameters;
   }
 
   // Now some generic eventObject handling code:
@@ -90,9 +90,9 @@ const newLeavesResponseFunction = async (eventObject, args) => {
   let eventParams;
 
   if (treeId === undefined || treeId === '') {
-    eventParams = config.contracts[contractName].events[eventName].parameters;
+    eventParams = config.contracts['default'].events[eventName].parameters;
   } else {
-    eventParams = config.contracts[contractName].treeId[treeId].events[eventName].parameters;
+    eventParams = config.contracts['default'].treeId[treeId].events[eventName].parameters;
   }
 
   // Now some generic eventObject handling code:
@@ -175,18 +175,18 @@ async function filterBlock(db, contractName, contractInstance, contractId, fromB
 
   // TODO: if possible, make this easier to read and follow. Fewer 'if' statements. Perhaps use 'switch' statements instead?
   if (treeId === undefined || treeId === '') {
-    eventNames = Object.keys(config.contracts[contractName].events);
+    eventNames = Object.keys(config.contracts['default'].events);
     if (config.treeHeight !== undefined || config.treeHeight !== '') {
       const { treeHeight } = config;
       metadataService.insertTreeHeight({ treeHeight });
     }
   } else {
     const { treeHeightDb } = await metadataService.getTreeHeight();
-    const { treeHeight } = config.contracts[contractName].treeId[treeId];
+    const { treeHeight } = config.contracts['default'].treeId[treeId];
     if (treeHeightDb !== treeHeight && (treeHeight !== undefined || treeHeight !== '')) {
       metadataService.insertTreeHeight({ treeHeight });
     }
-    eventNames = Object.keys(config.contracts[contractName].treeId[treeId].events);
+    eventNames = Object.keys(config.contracts['default'].treeId[treeId].events);
   }
 
   const { treeHeight } = await metadataService.getTreeHeight();

diff --git a/merkle-tree/src/routes/node.routes.js b/merkle-tree/src/routes/node.routes.js
@@ -207,14 +207,14 @@ async function getRoot(req, res, next) {
   }
 }
 
-// async function getHealthCheck(req, res, next) {
-//   try {
-//     res.data = "Ok";
-//     next();
-//   } catch (err) {
-//     next(err);
-//   }
-// }
+async function getHealthCheck(req, res, next) {
+  try {
+    res.data = "Ok";
+    next();
+  } catch (err) {
+    next(err);
+  }
+}
 
 
 // initializing routes
@@ -247,5 +247,5 @@ export default function(router) {
   // ROOT ROUTES
 
   router.route('/root').get(getRoot);
-  // router.route('/healthcheck').get(getHealthCheck);  
+  router.route('/healthcheck').get(getHealthCheck);  
 }