Merge "Enable size-based log rotation for monasca-log-api"

devstack/files/monasca-log-api/log-api-config.conf

@@ -16,9 +16,7 @@
 #
 
 [DEFAULT]
-log_file = monasca-log-api.log
-log_dir = /var/log/monasca/log-api
-debug = True
+log_config_append=/etc/monasca/log-api-logging.conf
 
 [service]
 region = useast

devstack/files/monasca-log-api/log-api-logging.conf

@@ -0,0 +1,36 @@
+[loggers]
+keys = root, kafka
+
+[handlers]
+keys = console, file
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = DEBUG
+formatter = default
+handlers = console, file
+
+[logger_kafka]
+qualname = kafka
+level = DEBUG
+formatter = default
+handlers = console, file
+propagate = 0
+
+[handler_console]
+class = logging.StreamHandler
+args = (sys.stderr,)
+level = DEBUG
+formatter = generic
+
+[handler_file]
+class = logging.handlers.RotatingFileHandler
+level = DEBUG
+formatter = generic
+# store up to 5*100MB of logs
+args = ('/var/log/monasca/log-api/monasca-log-api.log', 'a', 104857600, 5)
+
+[formatter_generic]
+format = %(asctime)s %(levelname)s [%(name)s][%(threadName)s] %(message)s

devstack/plugin.sh

@@ -92,6 +92,10 @@ function install_monasca_log_api {
     sudo chown mon-log-api:root /etc/monasca/log-api-config.conf
     sudo chmod 0660 /etc/monasca/log-api-config.conf
 
+    sudo cp -f "${PLUGIN_FILES}"/monasca-log-api/log-api-logging.conf /etc/monasca/log-api-logging.conf
+    sudo chown mon-log-api:root /etc/monasca/log-api-logging.conf
+    sudo chmod 0660 /etc/monasca/log-api-logging.conf
+
     if [[ ${SERVICE_HOST} ]]; then
         # set kafka ip address
         sudo sed -i "s/127\.0\.0\.1:9092/${SERVICE_HOST}:9092/g" /etc/monasca/log-api-config.conf
@@ -497,6 +501,7 @@ function clean_monasca_log_api {
     sudo rm -f /etc/init/monasca-log-api.conf
     sudo rm -f /etc/monasca/log-api-config.conf
     sudo rm -f /etc/monasca/log-api-config.ini
+    sudo rm -f /etc/monasca/log-api-logging.conf
 
     sudo rm -rf /opt/monasca-log-api
 

etc/monasca/log-api-config.conf

@@ -1,9 +1,7 @@
 [DEFAULT]
 # logging, make sure that the user under whom the server runs has permission
 # to write to the directory.
-log_file = monasca-log-api.log
-log_dir = .
-debug=False
+log_config_append=/etc/monasca/log-api-logging.conf
 
 # Dispatchers to be loaded to serve restful APIs
 [dispatcher]

etc/monasca/log-api-logging.conf

@@ -0,0 +1,36 @@
+[loggers]
+keys = root, kafka
+
+[handlers]
+keys = console, file
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = DEBUG
+formatter = default
+handlers = console, file
+
+[logger_kafka]
+qualname = kafka
+level = DEBUG
+formatter = default
+handlers = console, file
+propagate = 0
+
+[handler_console]
+class = logging.StreamHandler
+args = (sys.stderr,)
+level = DEBUG
+formatter = generic
+
+[handler_file]
+class = logging.handlers.RotatingFileHandler
+level = DEBUG
+formatter = generic
+# store up to 5*100MB of logs
+args = ('/var/log/monasca/log-api/monasca-log-api.log', 'a', 104857600, 5)
+
+[formatter_generic]
+format = %(asctime)s %(levelname)s [%(name)s][%(threadName)s] %(message)s

monasca_log_api/README.md

@@ -17,6 +17,7 @@ located::
 ```sh
     /etc/monasca/log-api-config.conf
     /etc/monasca/log-api-config.ini
+    /etc/monasca/log-api-logging.conf
 ```
 
 Once the configurations are modified to match your environment, you can start

setup.cfg

@@ -26,6 +26,7 @@ data_files =
     etc/monasca =
         etc/monasca/log-api-config.conf
         etc/monasca/log-api-config.ini
+        etc/monasca/log-api-logging.conf
 
 [entry_points]
 console_scripts =