Merge pull request #60 from eapowertools/add-version-number

Added version number to test page and server log.
eapowertools-archive · Nov 16, 2016 · 51c4b16 · 51c4b16
2 parents b904b44 + 4a8bd08
commit 51c4b16
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/app/index.htm b/app/index.htm
@@ -131,17 +131,29 @@
 
 
 		};
+
+		function getVersion()
+		{
+			$.get("../masterlib/version", function(result,strStatus,xhr)
+			{
+				if(xhr.status==200)
+				{
+					$("#gmsTitle").text("Governed Metrics Service " + result);  
+				}
+			})
+		};
+
 		</script>
 	</head>
 
-	<body>
+	<body onload="getVersion()">
 		<def>
 		</def>
 		<div id="header" class="frame">
-			<div id="header-text"><h1 style='color: #FFFFFF; font-size: 23pt; font-weight: bold; font-family: Arial;'>Governed Metrics Service</h1></div>
+			<div id="header-text"><h1 id="gmsTitle" style="color: #FFFFFF; font-size: 23pt; font-weight: bold; font-family: Arial;">Governed Metrics Service</h1></div>
 		</div>
 
-		<div id=main-body>
+		<div id="main-body">
 			<div id="left-buttons">
 				<button class="lui-button  lui-button--toolbar-inverse button-spacing" onclick="testConnection()">Test Connection</button>
 				<br/>

diff --git a/config/config.js b/config/config.js
@@ -37,6 +37,7 @@ var config = {
 		root: path.resolve(certPath,'root.pem')
 	},
 	gms: {
+		version: '1.5.3.0',
 		port: 8590,
 		hostname: friendlyHostname !== undefined ? friendlyHostname : globalHostname,
         routePath: path.join(__dirname, '/../routes/'),

diff --git a/routes/routes.js b/routes/routes.js
@@ -184,6 +184,12 @@ router.route('/changeOwner')
 		});
 	});
 
+router.route("/version")
+	.get(function(request, response)
+	{
+		response.status(200).send(config.gms.version);
+	});
+
 function isEmpty(obj){
 	for(var prop in obj){
 		if(obj.hasOwnProperty(prop))

diff --git a/server.js b/server.js
@@ -74,5 +74,5 @@ app.use('/masterlib',popmasterlib);
 var server = https.createServer(httpsOptions, app);
 server.listen(config.gms.port, function()
 {
-    logger.info('Governed Metrics Service started',{module:'server'});
+    logger.info('Governed Metrics Service version ' + config.gms.version + ' started',{module:'server'});
 });