[lxc-devel] [lxd/master] Temporary workaround for log15 API breakage

stgraber on Github lxc-bot at linuxcontainers.org
Mon Oct 2 18:22:59 UTC 2017


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 552 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20171002/de90eee4/attachment.bin>
-------------- next part --------------
From 30c859499e24ba6255508cd664c09cf4c1731bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 2 Oct 2017 14:20:13 -0400
Subject: [PATCH] Temporary workaround for log15 API breakage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

log15 broke their v2 API earlier today, this change should get things
building again until upstream log15 fixes the API breakage.

Related: https://github.com/inconshreveable/log15/issues/139

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 shared/logging/log_posix.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/shared/logging/log_posix.go b/shared/logging/log_posix.go
index ffc55da5d..5ada8081e 100644
--- a/shared/logging/log_posix.go
+++ b/shared/logging/log_posix.go
@@ -3,6 +3,8 @@
 package logging
 
 import (
+	slog "log/syslog"
+
 	log "gopkg.in/inconshreveable/log15.v2"
 )
 
@@ -13,11 +15,11 @@ func getSystemHandler(syslog string, debug bool, format log.Format) log.Handler
 		if !debug {
 			return log.LvlFilterHandler(
 				log.LvlInfo,
-				log.Must.SyslogHandler(syslog, format),
+				log.Must.SyslogHandler(slog.LOG_INFO, syslog, format),
 			)
 		}
 
-		return log.Must.SyslogHandler(syslog, format)
+		return log.Must.SyslogHandler(slog.LOG_INFO, syslog, format)
 	}
 
 	return nil


More information about the lxc-devel mailing list