Merge pull request #20 from OpenLMIS/1.6.1-SNAPSHOT

Stabilize consul registration and health checks

Author: kszymankiewicz-sd

CHANGELOG.md

@@ -1,6 +1,9 @@
 Upcoming Version / (WIP)
 ==================
 
+Improvements:
+* Stabilized consul registration and health checks
+
 1.5.0 / 2025-11-27
 ==================
 

Dockerfile

@@ -1,4 +1,11 @@
 FROM openlmis/service-base:7
 
 COPY build/libs/*.jar /service.jar
+
 COPY build/consul /consul
+WORKDIR /consul
+
+RUN npm install --production
+
+WORKDIR /
+

build.gradle

@@ -86,14 +86,14 @@ check {
 assemble {
     dependsOn ramlToHtml
     dependsOn copyRamlHtmlToBuild
-    dependsOn copyConsulRegistrationToBuild
+    dependsOn prepareConsulBuild
     dependsOn jacocoTestReport
 }
 
 build {
     dependsOn check
     dependsOn ramlToHtml
     dependsOn copyRamlHtmlToBuild
-    dependsOn copyConsulRegistrationToBuild
+    dependsOn prepareConsulBuild
     dependsOn jacocoTestReport
 }

consul/config.json

@@ -1,10 +1,17 @@
 {
   "service": {
     "Name": "report",
+    "Id": "report-service",
     "Port": 8080,
-    "Tags": ["openlmis-service"]
+    "Tags": ["openlmis-service"],
+    "check": {
+      "interval": "10s",
+      "http": "http://HOST:PORT/actuator/health",
+      "timeout": "5s",
+      "deregisterCriticalServiceAfter": "10m"
+    }
   },
-  "raml": "src/main/resources/api-definition.yaml",
+  "raml": "/consul/api-definition.yaml",
   "path": [
     "report",
     "report/docs",

consul/package.json

@@ -1,14 +1,16 @@
 {
   "name": "openlmis-consul-registration",
-  "version": "0.0.1",
-
-  "devDependencies":
-  {
-    "uuid": "~3.0.0",
-    "raml-parser": "~0.8.0",
-    "command-line-args": "~3.0.0",
-    "system-sleep": "~1.0.0",
-    "deasync": "~0.1.9",
-    "ip": "~1.1.0"
+  "version": "1.0.0",
+  "description": "Registration script for OpenLMIS Service",
+  "main": "registration.js",
+  "dependencies": {
+    "axios": "^1.6.0",
+    "command-line-args": "^5.2.1",
+    "ip": "^1.1.8",
+    "raml-parser": "~0.8.18",
+    "uuid": "^9.0.0"
+  },
+  "engines": {
+    "node": ">=18"
   }
-}
+}