Merge pull request #555 from kolyshkin/log-fixups

Logging fixups and cleanups

Author: jnovy

src/cmsg.c

@@ -36,20 +36,15 @@
 #define ECOMM EINVAL
 #endif
 
-#define error(s) \
-	do { \
-		fprintf(stderr, "conmon: %s %s\n", s, strerror(errno)); \
-		errno = ECOMM; \
-		goto err; /* return value */ \
-	} while (0)
-
 #define errorf(fmt, ...) \
 	do { \
-		fprintf(stderr, "conmon: " fmt ": %s\n", ##__VA_ARGS__, strerror(errno)); \
+		fprintf(stderr, "conmon: " fmt "\n", ##__VA_ARGS__); \
 		errno = ECOMM; \
 		goto err; /* return value */ \
 	} while (0)
 
+#define error(s) errorf("%s", s)
+
 /*
  * Sends a file descriptor along the sockfd provided. Returns the return
  * value of sendmsg(2). Any synchronisation and preparation of state

src/ctr_logging.c

@@ -328,7 +328,7 @@ static int write_journald(int pipe, char *buf, ssize_t buflen)
 
 		int err = sd_journal_sendv(bufv.iov, bufv.iovcnt);
 		if (err < 0) {
-			pwarn(strerror(-err));
+			nwarnf("sd_journal_sendv: %s", strerror(-err));
 			return err;
 		}
 
@@ -638,5 +638,5 @@ void sync_logs(void)
 	/* Sync the logs to disk */
 	if (k8s_log_fd > 0)
 		if (fsync(k8s_log_fd) < 0)
-			pwarn("Failed to sync log file before exit");
+			nwarnf("Failed to sync log file before exit: %m");
 }

src/ctr_stdio.c

@@ -140,7 +140,7 @@ static bool read_stdio(int fd, stdpipe_t pipe, gboolean *eof)
 				*eof = true;
 			return false;
 		}
-		nwarnf("stdio_input read failed %s", strerror(errno));
+		nwarnf("stdio_input read failed: %m");
 		return false;
 	} else {
 		// Always null terminate the buffer, just in case.

src/ctrl.c

@@ -231,7 +231,7 @@ static void resize_winsz(int height, int width)
 
 	int ret = ioctl(mainfd_stdout, TIOCSWINSZ, &ws);
 	if (ret == -1)
-		pwarn("Failed to set process pty terminal size");
+		nwarnf("Failed to set process pty terminal size: %m");
 }
 
 

src/oom.c

@@ -15,18 +15,18 @@ static void write_oom_adjust(int oom_score, int *old_value)
 	char fmt_oom_score[16];
 	int oom_score_fd = open("/proc/self/oom_score_adj", O_RDWR | O_CLOEXEC);
 	if (oom_score_fd < 0) {
-		ndebugf("failed to open /proc/self/oom_score_adj: %s\n", strerror(errno));
+		ndebugf("failed to open /proc/self/oom_score_adj: %m");
 		return;
 	}
 	if (old_value) {
 		if (read(oom_score_fd, fmt_oom_score, sizeof(fmt_oom_score)) < 0) {
-			ndebugf("failed to read from /proc/self/oom_score_adj: %s\n", strerror(errno));
+			ndebugf("failed to read from /proc/self/oom_score_adj: %m");
 		}
 		*old_value = atoi(fmt_oom_score);
 	}
 	sprintf(fmt_oom_score, "%d", oom_score);
 	if (write(oom_score_fd, fmt_oom_score, strlen(fmt_oom_score)) < 0) {
-		ndebugf("failed to write to /proc/self/oom_score_adj: %s\n", strerror(errno));
+		ndebugf("failed to write to /proc/self/oom_score_adj: %m");
 	}
 	close(oom_score_fd);
 #else

src/utils.h

@@ -37,43 +37,36 @@ extern gboolean use_syslog;
 
 #define _pexit(s) \
 	do { \
-		fprintf(stderr, "[conmon:e]: %s %s\n", s, strerror(errno)); \
+		fprintf(stderr, "[conmon:e]: %s %m\n", s); \
 		if (use_syslog) \
-			syslog(LOG_ERR, "conmon %.20s <error>: %s %s\n", log_cid, s, strerror(errno)); \
+			syslog(LOG_ERR, "conmon %.20s <error>: %s %m\n", log_cid, s); \
 		_exit(EXIT_FAILURE); \
 	} while (0)
 
 #define _pexitf(fmt, ...) \
 	do { \
-		fprintf(stderr, "[conmon:e]: " fmt " %s\n", ##__VA_ARGS__, strerror(errno)); \
+		fprintf(stderr, "[conmon:e]: " fmt " %m\n", ##__VA_ARGS__); \
 		if (use_syslog) \
-			syslog(LOG_ERR, "conmon %.20s <error>: " fmt ": %s\n", log_cid, ##__VA_ARGS__, strerror(errno)); \
+			syslog(LOG_ERR, "conmon %.20s <error>: " fmt ": %m\n", log_cid, ##__VA_ARGS__); \
 		_exit(EXIT_FAILURE); \
 	} while (0)
 
 #define pexit(s) \
 	do { \
-		fprintf(stderr, "[conmon:e]: %s %s\n", s, strerror(errno)); \
+		fprintf(stderr, "[conmon:e]: %s %m\n", s); \
 		if (use_syslog) \
-			syslog(LOG_ERR, "conmon %.20s <error>: %s %s\n", log_cid, s, strerror(errno)); \
+			syslog(LOG_ERR, "conmon %.20s <error>: %s %m\n", log_cid, s); \
 		exit(EXIT_FAILURE); \
 	} while (0)
 
 #define pexitf(fmt, ...) \
 	do { \
-		fprintf(stderr, "[conmon:e]: " fmt " %s\n", ##__VA_ARGS__, strerror(errno)); \
+		fprintf(stderr, "[conmon:e]: " fmt " %m\n", ##__VA_ARGS__); \
 		if (use_syslog) \
-			syslog(LOG_ERR, "conmon %.20s <error>: " fmt ": %s\n", log_cid, ##__VA_ARGS__, strerror(errno)); \
+			syslog(LOG_ERR, "conmon %.20s <error>: " fmt ": %m\n", log_cid, ##__VA_ARGS__); \
 		exit(EXIT_FAILURE); \
 	} while (0)
 
-#define pwarn(s) \
-	do { \
-		fprintf(stderr, "[conmon:w]: %s %s\n", s, strerror(errno)); \
-		if (use_syslog) \
-			syslog(LOG_INFO, "conmon %.20s <pwarn>: %s %s\n", log_cid, s, strerror(errno)); \
-	} while (0)
-
 #define nexit(s) \
 	do { \
 		fprintf(stderr, "[conmon:e] %s\n", s); \