Merge lp:~raharper/curtin/trunk.add-syslog-handler into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

Always log to syslog

Add a default syslog log handler and always enable.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:527
https://jenkins.ubuntu.com/server/job/curtin-ci/624/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/624
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/624
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/624
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/624

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/624/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

Adjust your comment to mention that we are now supporting multiple handlers at once (I think).
And then i approve.

Is there a way to disable the syslog logger? It doesnt look like it. I dont have a reason at the moment to suggest that it needs to be.

review: Approve

[Ryan Harper (raharper)]

On Tue, Nov 28, 2017 at 9:52 AM, Scott Moser <email address hidden>
wrote:

> Review: Approve
>
> Adjust your comment to mention that we are now supporting multiple
> handlers at once (I think).
> And then i approve.
>
> Is there a way to disable the syslog logger? It doesnt look like it. I
> dont have a reason at the moment to suggest that it needs to be.
>

I want to review it in light of the journal_report logger; I thought this
would have replaced it but the journal reporter was needed separately
and the syslog had some interesting side-effects w.r.t the reporting logger.

I'll mark this WIP

Ryan

>
>
> --
> https://code.launchpad.net/~raharper/curtin/trunk.add-
> syslog-handler/+merge/330914
> You are the owner of lp:~raharper/curtin/trunk.add-syslog-handler.
>

Unmerged revisions

527. By Ryan Harper on 2017-09-15

log: always write to syslog

=== modified file 'curtin/log.py'
--- curtin/log.py	2015-08-12 20:58:05 +0000
+++ curtin/log.py	2017-09-18 14:50:41 +0000
@@ -16,6 +16,7 @@
 #   along with Curtin.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+import logging.handlers
 
 # Logging items for easy access
 getLogger = logging.getLogger
@@ -29,6 +30,9 @@
 DEBUG = logging.DEBUG
 NOTSET = logging.NOTSET
 
+CURTIN_LOG_FMT = \
+    "[CURTIN] %(asctime)s - %(filename)s[%(levelname)s]: %(message)s"
+
 
 class NullHandler(logging.Handler):
     def emit(self, record):
@@ -36,6 +40,9 @@
 
 
 def basicConfig(**kwargs):
+    # always log to syslog
+    syslog = logging.handlers.SysLogHandler(address='/dev/log')
+    handlers = [syslog]
     # basically like logging.basicConfig but only output for our logger
     if kwargs.get('filename'):
         handler = logging.FileHandler(filename=kwargs['filename'],
@@ -44,6 +51,7 @@
         handler = logging.StreamHandler(stream=kwargs['stream'])
     else:
         handler = NullHandler()
+    handlers.append(handler)
 
     if 'verbosity' in kwargs:
         level = ((logging.ERROR, logging.INFO, logging.DEBUG)
@@ -51,9 +59,11 @@
     else:
         level = kwargs.get('level', logging.NOTSET)
 
-    handler.setFormatter(logging.Formatter(fmt=kwargs.get('format'),
-                                           datefmt=kwargs.get('datefmt')))
-    handler.setLevel(level)
+    fmt = kwargs.get('format', CURTIN_LOG_FMT)
+    for handler in handlers:
+        handler.setFormatter(logging.Formatter(fmt=fmt,
+                                               datefmt=kwargs.get('datefmt')))
+        handler.setLevel(level)
 
     logging.getLogger().setLevel(level)
 
@@ -63,6 +73,9 @@
     logger.setLevel(level)
     logger.addHandler(handler)
 
+    for h in handlers:
+        logger.addHandler(h)
+
 
 def _getLogger(name='curtin'):
     return logging.getLogger(name)