summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuangrongFu <fu.guangrong@zte.com.cn>2018-09-10 18:15:49 +0800
committerGuangrongFu <fu.guangrong@zte.com.cn>2018-09-10 18:15:49 +0800
commitaddd081a91a85d038c042f91bcf0f56a838a9c68 (patch)
tree989c6f29f645c810af36fb72e704098bd3ec9e1b
parentfe82105b379a26dae3d552b483965833f10fe4b9 (diff)
Added health check url to MSB registration
Change-Id: I2ccd68ca20b88be3179058cd0f29055cdf442946 Issue-ID: HOLMES-130 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
-rw-r--r--rulemgt-standalone/src/main/assembly/bin/initDB.sh6
-rw-r--r--rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java4
2 files changed, 7 insertions, 3 deletions
diff --git a/rulemgt-standalone/src/main/assembly/bin/initDB.sh b/rulemgt-standalone/src/main/assembly/bin/initDB.sh
index 82fbea6..46fb1e6 100644
--- a/rulemgt-standalone/src/main/assembly/bin/initDB.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/initDB.sh
@@ -22,7 +22,7 @@ password=$2
dbname=$3
port=$4
host=$5
-echo "start init holmes rulemgt db"
+echo "Initializing the holmes rule management database..."
main_path=$HOME/..
sed -i "s|DBNAME|$dbname|g" "$main_path/dbscripts/postgresql/onap-holmes_rulemgt-createobj.sql"
@@ -42,8 +42,8 @@ sql_result=$?
unset PGPASSWORD
echo "sql_result=$sql_result"
if [ $sql_result != 0 ] ; then
- echo "failed to init rulemgt database!"
+ echo "Failed to initialize the database!"
exit 1
fi
-echo "init rulemgt success!"
+echo "The database is initialized successfully!"
exit 0
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
index 5d577cc..c87be76 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
@@ -87,6 +87,10 @@ public class RuleActiveApp extends IOCApplication<RuleAppConfig> {
Node node = new Node();
node.setIp(serviceAddrInfo[0]);
node.setPort(serviceAddrInfo[1]);
+ node.setCheckType("HTTP");
+ node.setCheckUrl(String.format("https://%s:%s/api/holmes-rule-mgmt/v1/healthcheck", serviceAddrInfo[0], serviceAddrInfo[1]));
+ node.setCheckTimeOut("60s");
+ node.setCheckInterval("60s");
nodes.add(node);
msinfo.setNodes(nodes);
return msinfo;