From 20bbac2f2a95d28664bcf2627f2a9e15cfd0ccda Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Mon, 4 Jun 2018 15:17:12 +0100
Subject: [PATCH] commited service logging updates, merged clmcservice branch
---
scripts/clmc-service/install.sh | 4 ++--
src/service/clmcservice/aggregator.py | 2 +-
src/service/development.ini | 4 ++--
src/service/production.ini | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/scripts/clmc-service/install.sh b/scripts/clmc-service/install.sh
index 4928337..c160dcf 100755
--- a/scripts/clmc-service/install.sh
+++ b/scripts/clmc-service/install.sh
@@ -159,7 +159,7 @@ fi
# create directory for CLMC service logs
echo "----> Creating CLMC web service log directory"
-sudo mkdir /var/log/clmcservice
+mkdir -p /var/log/flame/clmc
# Install minioclmc as systemctl service
# -----------------------------------------------------------------------
@@ -169,7 +169,7 @@ echo "#!/bin/bash" > $start_script_file
echo "export WORKON_HOME=${HOME}/.virtualenvs" >> $start_script_file
echo "source /usr/local/bin/virtualenvwrapper.sh" >> $start_script_file
echo "workon CLMC" >> $start_script_file
-echo "pserve ${REPO_ROOT}/src/service/production.ini > /dev/null 2>&1 &" >> $start_script_file
+echo "pserve ${REPO_ROOT}/src/service/production.ini &" >> $start_script_file
chmod 755 $start_script_file
diff --git a/src/service/clmcservice/aggregator.py b/src/service/clmcservice/aggregator.py
index 1f796dd..bbbae13 100644
--- a/src/service/clmcservice/aggregator.py
+++ b/src/service/clmcservice/aggregator.py
@@ -183,7 +183,7 @@ class Aggregator(object):
if __name__ == '__main__':
# initialise a file logger, only when module's main method is run (NOT when aggregator class is imported somewhere else)
log = logging.getLogger('aggregator')
- hdlr = logging.FileHandler('/var/log/clmcservice/aggregator.log', mode='a')
+ hdlr = logging.FileHandler('/var/log/flame/clmc/aggregator.log', mode='a')
formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
hdlr.setFormatter(formatter)
log.addHandler(hdlr)
diff --git a/src/service/development.ini b/src/service/development.ini
index b4bc091..9345526 100644
--- a/src/service/development.ini
+++ b/src/service/development.ini
@@ -67,13 +67,13 @@ formatter = generic
[handler_filelog]
class = FileHandler
-args = ('/var/log/clmcservice/service.log','a')
+args = ('/var/log/flame/clmc/service.log','a')
level = NOTSET
formatter = generic
[handler_exc_handler]
class = FileHandler
-args = ('/var/log/clmcservice/service-exceptions.log', 'a')
+args = ('/var/log/flame/clmc/service-exceptions.log', 'a')
level = ERROR
formatter = exc_formatter
diff --git a/src/service/production.ini b/src/service/production.ini
index fbb9d4e..2e1cfcf 100644
--- a/src/service/production.ini
+++ b/src/service/production.ini
@@ -33,7 +33,7 @@ listen = *:9080
###
[loggers]
-keys = root, exc_logger, clmcservice
+keys = root, exc_logger, service_logger
[handlers]
keys = console, filelog, exc_handler
@@ -45,7 +45,7 @@ keys = generic, exc_formatter
level = INFO
handlers = console
-[logger_clmcservice]
+[logger_service_logger]
level = INFO
handlers = filelog
qualname = service_logger
@@ -63,13 +63,13 @@ formatter = generic
[handler_filelog]
class = FileHandler
-args = ('/var/log/clmcservice/service.log','a')
+args = ('/var/log/flame/clmc/service.log','a')
level = NOTSET
formatter = generic
[handler_exc_handler]
class = FileHandler
-args = ('/var/log/clmcservice/service-exceptions.log', 'a')
+args = ('/var/log/flame/clmc/service-exceptions.log', 'a')
level = ERROR
formatter = exc_formatter
--
GitLab