Align Python Action logging with other st2 components:

- instead of hardcoded StreamHandler use logging configured in "cfg.CONF.actionrunner.logging"
- update logging config to be a RotatingFileHandler and not include PID in name. PID is now part of the message format string so this information is not lost.
- align logrotate config with above changes

Author: andrew-regan

conf/logrotate.conf

@@ -86,9 +86,6 @@ notifempty
   daily
   rotate 5
   postrotate
-    # Delete all files that haven't been modified in over 30 days
-    # Clean up stale PID logs
-    find . -type f -name "st2actionrunner*" -mtime +30 -exec rm -f {} \;
     st2ctl reopen-log-files st2actionrunner
   endscript
 }

st2actions/conf/logging.conf

@@ -18,16 +18,16 @@ formatter=simpleConsoleFormatter
 args=(sys.stdout,)
 
 [handler_fileHandler]
-class=st2common.log.FormatNamedFileHandler
+class=handlers.RotatingFileHandler
 level=INFO
 formatter=verboseConsoleFormatter
-args=('logs/st2actionrunner.{pid}.log',)
+args=('logs/st2actionrunner.log',)
 
 [handler_auditHandler]
-class=st2common.log.FormatNamedFileHandler
+class=handlers.RotatingFileHandler
 level=AUDIT
 formatter=jsonFormatter
-args=('logs/st2actionrunner.{pid}.audit.log',)
+args=('logs/st2actionrunner.audit.log',)
 
 [formatter_simpleConsoleFormatter]
 class=st2common.logging.formatters.ConsoleLogFormatter
@@ -36,7 +36,7 @@ datefmt=
 
 [formatter_verboseConsoleFormatter]
 class=st2common.logging.formatters.ConsoleLogFormatter
-format=%(asctime)s %(thread)s %(levelname)s %(module)s [-] %(message)s
+format=%(asctime)s %(process)d %(thread)s %(levelname)s %(module)s [-] %(message)s
 datefmt=
 
 [formatter_gelfFormatter]

st2actions/st2actions/runners/python_action_wrapper.py

@@ -16,7 +16,8 @@
 import sys
 import json
 import argparse
-import logging as stdlib_logging
+
+from oslo_config import cfg
 
 from st2common import log as logging
 from st2actions import config
@@ -47,7 +48,7 @@ def __init__(self, pack, file_path, parameters=None, parent_args=None):
         :type parameters: ``dict`` or ``None``
 
         :param parent_args: Command line arguments passed to the parent process.
-        :type parse_args: ``list``
+        :type parent_args: ``list``
         """
 
         self._pack = pack
@@ -115,13 +116,7 @@ def _set_up_logger(self, action_name):
         logger_name = 'actions.python.%s' % (action_name)
         logger = logging.getLogger(logger_name)
 
-        console = stdlib_logging.StreamHandler()
-        console.setLevel(stdlib_logging.DEBUG)
-
-        formatter = stdlib_logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
-        console.setFormatter(formatter)
-        logger.addHandler(console)
-        logger.setLevel(stdlib_logging.DEBUG)
+        logging.setup(cfg.CONF.actionrunner.logging)
 
         return logger