From 9c95206baca32133bfa24767bfbb51765f0a6a72 Mon Sep 17 00:00:00 2001 From: darfed Date: Thu, 30 Jun 2016 14:56:39 +0100 Subject: [PATCH] Corrected log file name The log file was being duplicated at monasca-transform.log and monasca_transform.log. Fixed this to be set simply at monasca-transform.log. Change-Id: I6a63737c569b06a271e11b880675edadfbdcc250 --- devstack/files/monasca-transform/monasca-transform.conf | 3 +++ devstack/plugin.sh | 3 ++- etc/monasca-transform.conf | 3 +++ monasca_transform/config/config_initializer.py | 2 ++ monasca_transform/driver/mon_metrics_kafka.py | 6 ++++-- requirements.txt | 1 + 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/devstack/files/monasca-transform/monasca-transform.conf b/devstack/files/monasca-transform/monasca-transform.conf index 50cddbb..1d13ec1 100644 --- a/devstack/files/monasca-transform/monasca-transform.conf +++ b/devstack/files/monasca-transform/monasca-transform.conf @@ -48,6 +48,9 @@ spark_driver = /opt/monasca/transform/lib/driver.py # the location for the transform-service log service_log_path=/var/log/monasca/transform/ +# the filename for the transform-service log +service_log_filename=monasca-transform.log + # Whether Spark event logging should be enabled (true/false) spark_event_logging_enabled = true diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 98c6d56..e802a2b 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -309,7 +309,8 @@ function copy_monasca_transform_files { sudo cp -f "${MONASCA_TRANSFORM_BASE}"/monasca-transform/devstack/files/monasca-transform/transform_specs.sql /opt/monasca/transform/lib/. sudo cp -f "${MONASCA_TRANSFORM_BASE}"/monasca-transform/devstack/files/monasca-transform/pre_transform_specs.sql /opt/monasca/transform/lib/. sudo chown -R monasca-transform:monasca-transform /opt/monasca/transform - + sudo touch /var/log/monasca/transform/monasca-transform.log + sudo chown monasca-transform:monasca-transform /var/log/monasca/transform/monasca-transform.log } function create_monasca_transform_venv { diff --git a/etc/monasca-transform.conf b/etc/monasca-transform.conf index ba7b7aa..915230c 100644 --- a/etc/monasca-transform.conf +++ b/etc/monasca-transform.conf @@ -54,6 +54,9 @@ spark_driver = /opt/stack/monasca-transform/monasca_transform/driver/mon_metrics # the location for the transform-service log service_log_path=/opt/stack/monasca-transform +# the filename for the transform-service log +service_log_filename=monasca-transform.log + # Whether Spark event logging should be enabled (true/false) spark_event_logging_enabled = true diff --git a/monasca_transform/config/config_initializer.py b/monasca_transform/config/config_initializer.py index 05f3ce5..0283ced 100644 --- a/monasca_transform/config/config_initializer.py +++ b/monasca_transform/config/config_initializer.py @@ -102,6 +102,8 @@ class ConfigInitializer(object): cfg.StrOpt('setup_target'), cfg.StrOpt('spark_driver'), cfg.StrOpt('service_log_path'), + cfg.StrOpt('service_log_filename', + default='monasca-transform.log'), cfg.StrOpt('spark_event_logging_dest'), cfg.StrOpt('spark_event_logging_enabled'), cfg.StrOpt('spark_jars_list'), diff --git a/monasca_transform/driver/mon_metrics_kafka.py b/monasca_transform/driver/mon_metrics_kafka.py index cdbc4d8..249c458 100644 --- a/monasca_transform/driver/mon_metrics_kafka.py +++ b/monasca_transform/driver/mon_metrics_kafka.py @@ -52,8 +52,10 @@ ConfigInitializer.basic_config() # initialize logger log = logging.getLogger(__name__) -_h = logging.FileHandler('%s/monasca_transform.log' % - cfg.CONF.service.service_log_path) +_h = logging.FileHandler('%s/%s' % ( + cfg.CONF.service.service_log_path, + cfg.CONF.service.service_log_filename) +) _h.setFormatter(logging.Formatter("'%(asctime)s - %(pathname)s:" "%(lineno)s - %(levelname)s - %(message)s'")) log.addHandler(_h) diff --git a/requirements.txt b/requirements.txt index 2991d96..04eef46 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,3 +8,4 @@ oslo.config>=1.2.1 oslo.log oslo.service tooz +kazoo