From: 2xsec Date: Tue, 26 Jun 2018 05:33:17 +0000 (+0900) Subject: log: change DEBUG, INFO, TRACE, NOTICE macro using strerror to SYS* macro X-Git-Tag: lxc-3.1.0~230^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7874d81a4df7f75391f3afb70b765d011a245dc4;p=thirdparty%2Flxc.git log: change DEBUG, INFO, TRACE, NOTICE macro using strerror to SYS* macro Signed-off-by: 2xsec --- diff --git a/src/lxc/cmd/lxc_init.c b/src/lxc/cmd/lxc_init.c index 2f0303451..65c765c35 100644 --- a/src/lxc/cmd/lxc_init.c +++ b/src/lxc/cmd/lxc_init.c @@ -335,9 +335,8 @@ int main(int argc, char *argv[]) sigerr = signal(i, SIG_DFL); if (sigerr == SIG_ERR) { - DEBUG("%s - Failed to reset to default action " - "for signal \"%d\": %d", strerror(errno), - i, pid); + SYSDEBUG("Failed to reset to default action " + "for signal \"%d\": %d", i, pid); } } @@ -409,8 +408,7 @@ int main(int argc, char *argv[]) } else { ret = kill(-1, SIGTERM); if (ret < 0) - DEBUG("%s - Failed to send SIGTERM to " - "all children", strerror(errno)); + SYSDEBUG("Failed to send SIGTERM to all children"); } alarm(1); } @@ -424,16 +422,14 @@ int main(int argc, char *argv[]) } else { ret = kill(-1, SIGKILL); if (ret < 0) - DEBUG("%s - Failed to send SIGTERM to " - "all children", strerror(errno)); + SYSDEBUG("Failed to send SIGTERM to all children"); } break; } default: ret = kill(pid, was_interrupted); if (ret < 0) - DEBUG("%s - Failed to send signal \"%d\" to " - "%d", strerror(errno), was_interrupted, pid); + SYSDEBUG("Failed to send signal \"%d\" to %d", was_interrupted, pid); break; } ret = EXIT_SUCCESS; diff --git a/src/lxc/cmd/lxc_monitord.c b/src/lxc/cmd/lxc_monitord.c index 96f530fec..4f8db5707 100644 --- a/src/lxc/cmd/lxc_monitord.c +++ b/src/lxc/cmd/lxc_monitord.c @@ -91,7 +91,7 @@ static int lxc_monitord_fifo_create(struct lxc_monitor *mon) ret = mknod(fifo_path, S_IFIFO|S_IRUSR|S_IWUSR, 0); if (ret < 0 && errno != EEXIST) { - INFO("Failed to mknod monitor fifo %s: %s.", fifo_path, strerror(errno)); + SYSINFO("Failed to mknod monitor fifo %s", fifo_path); return -1; } diff --git a/src/lxc/commands.c b/src/lxc/commands.c index ca77affd4..53015a0cd 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -307,8 +307,8 @@ static int lxc_cmd(const char *name, struct lxc_cmd_rr *cmd, int *stopped, client_fd = lxc_cmd_send(name, cmd, lxcpath, hashed_sock_name); if (client_fd < 0) { - TRACE("%s - Command \"%s\" failed to connect command socket", - strerror(errno), lxc_cmd_str(cmd->req.cmd)); + SYSTRACE("Command \"%s\" failed to connect command socket", + lxc_cmd_str(cmd->req.cmd)); if (client_fd == -ECONNREFUSED) *stopped = 1; diff --git a/src/lxc/conf.c b/src/lxc/conf.c index cc97ea9d1..763a2cb76 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -1942,9 +1942,8 @@ static int mount_entry(const char *fsname, const char *target, rootfs); if (ret < 0) { if (optional) { - INFO("%s - Failed to mount \"%s\" on \"%s\" " - "(optional)", strerror(errno), - srcpath ? srcpath : "(null)", target); + SYSINFO("Failed to mount \"%s\" on \"%s\" (optional)", + srcpath ? srcpath : "(null)", target); return 0; } @@ -2000,10 +1999,8 @@ static int mount_entry(const char *fsname, const char *target, ret = mount(srcpath, target, fstype, mountflags | MS_REMOUNT, data); if (ret < 0) { if (optional) { - INFO("Failed to mount \"%s\" on \"%s\" " - "(optional): %s", - srcpath ? srcpath : "(null)", target, - strerror(errno)); + SYSINFO("Failed to mount \"%s\" on \"%s\" (optional)", + srcpath ? srcpath : "(null)", target); return 0; } @@ -2017,8 +2014,8 @@ static int mount_entry(const char *fsname, const char *target, ret = mount(NULL, target, NULL, pflags, NULL); if (ret < 0) { if (optional) { - INFO("%s - Failed to change mount propagation " - "for \"%s\" (optional)", strerror(errno), target); + SYSINFO("Failed to change mount propagation " + "for \"%s\" (optional)", target); return 0; } else { SYSERROR("Failed to change mount propagation " diff --git a/src/lxc/initutils.c b/src/lxc/initutils.c index b95bffdfe..4ca2ce197 100644 --- a/src/lxc/initutils.c +++ b/src/lxc/initutils.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#define _GNU_SOURCE #include #include "initutils.h" @@ -364,7 +365,7 @@ int setproctitle(char *title) if (ret == 0) (void)strlcpy((char*)arg_start, title, len); else - INFO("setting cmdline failed - %s", strerror(errno)); + SYSINFO("setting cmdline failed"); return ret; } diff --git a/src/lxc/storage/overlay.c b/src/lxc/storage/overlay.c index 0d1f81820..05d1a3fe0 100644 --- a/src/lxc/storage/overlay.c +++ b/src/lxc/storage/overlay.c @@ -636,9 +636,9 @@ int ovl_mount(struct lxc_storage *bdev) ret = ovl_remount_on_enodev(lower, bdev->dest, ovl_name, MS_MGC_VAL | mntflags, options_work); if (ret < 0) { - INFO("Failed to mount \"%s\" on \"%s\" with options \"%s\". " - "Retrying without workdir: %s", - lower, bdev->dest, options_work, strerror(errno)); + SYSINFO("Failed to mount \"%s\" on \"%s\" with options \"%s\". " + "Retrying without workdir", + lower, bdev->dest, options_work); /* Assume we cannot use a workdir as we are on a version <= v21. */ diff --git a/src/lxc/storage/storage_utils.c b/src/lxc/storage/storage_utils.c index fa8dfaf41..b0a190438 100644 --- a/src/lxc/storage/storage_utils.c +++ b/src/lxc/storage/storage_utils.c @@ -385,7 +385,7 @@ int find_fstype_cb(char *buffer, void *data) } if (mount(cbarg->rootfs, cbarg->target, fstype, mntflags, mntdata)) { - DEBUG("mount failed with error: %s", strerror(errno)); + SYSDEBUG("mount failed with error"); free(mntdata); return 0; } diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c index b942e4921..06c04ab0b 100644 --- a/src/lxc/terminal.c +++ b/src/lxc/terminal.c @@ -163,8 +163,7 @@ struct lxc_terminal_state *lxc_terminal_signal_init(int srcfd, int dstfd) lxc_list_add_tail(&lxc_ttys, &ts->node); ret = sigaddset(&mask, SIGWINCH); if (ret < 0) - NOTICE("%s - Failed to add SIGWINCH to signal set", - strerror(errno)); + SYSNOTICE("Failed to add SIGWINCH to signal set"); } /* Exit the mainloop cleanly on SIGTERM. */ @@ -411,9 +410,10 @@ int lxc_terminal_io_cb(int fd, uint32_t events, void *data, if (w != r) WARN("Short write on terminal r:%d != w:%d", r, w); - if (w_rbuf < 0) - TRACE("%s - Failed to write %d bytes to terminal ringbuffer", - strerror(-w_rbuf), r); + if (w_rbuf < 0) { + errno = -w_rbuf; + SYSTRACE("Failed to write %d bytes to terminal ringbuffer", r); + } if (w_log < 0) TRACE("Failed to write %d bytes to terminal log", r); @@ -681,8 +681,7 @@ static int lxc_terminal_peer_default(struct lxc_terminal *terminal) if (terminal->peer < 0) { if (!terminal->path) { errno = ENODEV; - DEBUG("%s - The process does not have a controlling " - "terminal", strerror(errno)); + SYSDEBUG("The process does not have a controlling terminal"); goto on_succes; } diff --git a/src/lxc/utils.c b/src/lxc/utils.c index 42bdbf60d..39676c7e0 100644 --- a/src/lxc/utils.c +++ b/src/lxc/utils.c @@ -1080,7 +1080,8 @@ int randseed(bool srand_it) if (f) { int ret = fread(&seed, sizeof(seed), 1, f); if (ret != 1) - DEBUG("unable to fread /dev/urandom, %s, fallback to time+pid rand seed", strerror(errno)); + SYSDEBUG("unable to fread /dev/urandom, fallback to time+pid rand seed"); + fclose(f); }