[lxc-devel] [lxc/master] log: fix cmd logging

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200320/62052dfc/attachment.bin>
-------------- next part --------------
From a1162a6ce7d8390d5224edf298dd0cf13733c66e Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Fri, 20 Mar 2020 22:02:12 +0100
Subject: [PATCH] log: fix cmd logging

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 src/lxc/log.h | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/lxc/log.h b/src/lxc/log.h
index 7bd3556a8e..d280656241 100644
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -456,27 +456,28 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,	\
 #endif
 
 #if HAVE_M_FORMAT
-#define CMD_SYSERROR(format, ...)                                            \
-	fprintf(stderr, "%m - %s: %d: %s: " format "\n", __FILE__, __LINE__, \
+#define CMD_SYSERROR(format, ...)                                             \
+	fprintf(stderr, "%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, \
 		__func__, ##__VA_ARGS__);
 #else
-#define CMD_SYSERROR(format, ...)                                          \
-	do {                                                               \
-		lxc_log_strerror_r;                                        \
-		fprintf(stderr, "%s - %s: %d: %s: " format "\n", __FILE__, \
-			__LINE__, __func__, ptr, ##__VA_ARGS__);           \
+#define CMD_SYSERROR(format, ...)                                           \
+	do {                                                                \
+		lxc_log_strerror_r;                                         \
+		fprintf(stderr, "%s: %d: %s - %s - " format "\n", __FILE__, \
+			__LINE__, __func__, ptr, ##__VA_ARGS__);            \
 	} while (0)
 #endif
 
 #if HAVE_M_FORMAT
-#define CMD_SYSINFO(format, ...)                            \
-		printf("%m - " format, ##__VA_ARGS__)
+#define CMD_SYSINFO(format, ...)                                               \
+	printf("%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, __func__, \
+	       ##__VA_ARGS__);
 #else
-#define CMD_SYSINFO(format, ...)                                            \
-	do {                                                                \
-		lxc_log_strerror_r;                                         \
-		prinft("%s - %s: %d: %s: " format "\n", __FILE__, __LINE__, \
-		       __func__, ptr, ##__VA_ARGS__);                       \
+#define CMD_SYSINFO(format, ...)                                             \
+	do {                                                                 \
+		lxc_log_strerror_r;                                          \
+		printf("%s: %d: %s - %s - " format "\n", __FILE__, __LINE__, \
+		       __func__, ptr, ##__VA_ARGS__);                        \
 	} while (0)
 #endif