Merge pull request #47 from GilHoggarth/master

Correction to nohup command

stat-pusher/ldl-pusher.py

@@ -159,7 +159,7 @@ def script(eset):
 	# create web service
 	monitorServer = HTTPServer((eset['hostname'], int(eset['port'])), webServer)
 	logger.info(f"Started LDL monitoring web server:  {eset['hostname']}:{eset['port']}")
-	logger.debug(f"Pushing to gateway every [{eset['schedule']}] minutes")
+	logger.info(f"Pushing to {eset['pushgtw']} gateway every {eset['schedule']} minutes")
 	try:
 		monitorServer.serve_forever()
 	except Exception as e:
@@ -178,7 +178,7 @@ def script(eset):
 		sys.exit(1)
 
 	# get swarm environment
-	senvMatch = re.match('^(dev|beta|monitor)', socket.gethostname())
+	senvMatch = re.match('^(dev|beta|prod|monitor)', socket.gethostname())
 	if senvMatch:
 		environ = senvMatch.group(1)
 	else:

stat-pusher/run_ldl_pusher.sh

@@ -14,7 +14,7 @@ cd $PYTHONPATH
 pip install -r ldl-requirements.txt
 
 # run stat-pusher script
-if [[ ${HOSTNAME} =~ ^prod ]]; then
+if [[ ${HOSTNAME} =~ ^(monitor|prod) ]]; then
 	nohup python ldl-pusher.py  > /dev/null &	# disable generation of large logs over time
 else
 	nohup python ldl-pusher.py &