diff --git a/scripts/clmc-service/install.sh b/scripts/clmc-service/install.sh index 49283376d927da3823a2f14839cd4cd5d479cdf8..c160dcfbd01bbc17dc3ccabb811204990f7935e8 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 1f796dd10f00333312b2e62fd60d7f6d90f3ce1e..bbbae1375b438280bc28b10bf2d85f6d18d32237 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 b4bc0916607728489c7b2584dd3fa67157baeb40..9345526c2834678369a156178b49e5bad39d6c56 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 fbb9d4e0b38d5c53a30d9f0aae2473101a442383..2e1cfcf66101b9eec64b22d8a71c2bd72b092961 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