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

@@ -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
 

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 {

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
 

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'),

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)

requirements.txt

@@ -8,3 +8,4 @@ oslo.config>=1.2.1
 oslo.log
 oslo.service
 tooz
+kazoo