log: change DEBUG, INFO, TRACE, NOTICE macro using strerror to SYS* macro

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

diff --git a/src/lxc/cmd/lxc_init.c b/src/lxc/cmd/lxc_init.c
index 2f03034512a2860bb26ffddd4080a9d533f5987e..65c765c35bded7c42d3fe9bc6a53cd5de29ef158 100644 (file)
--- 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 96f530fecbf18c1aac0486adf54282abfd53e142..4f8db5707561e08514294eeb6a20f65f1a1b200e 100644 (file)
--- 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 ca77affd4d49cccb6fbf931f02d23ebe8be0db13..53015a0cd02ece376eff36515898e78210bc1745 100644 (file)
--- 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 cc97ea9d1c082aba91b6ca48493db69332fecef6..763a2cb76b6049ea6e3a90f176e2a090681bcb91 100644 (file)
--- 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 b95bffdfe95a51f8ac6380513b77aa1e204f84ef..4ca2ce1976599eb90cce87fc785a77fc4f08d824 100644 (file)
--- 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 <sys/prctl.h>
 
 #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 0d1f818207f098da547e050e36812c67f6b9b1c5..05d1a3fe03f171785aea438caec88457f22aae0b 100644 (file)
--- 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 fa8dfaf41d6e12960bce755399a3bb326a8f5ffe..b0a19043802ebf2f3ab50219ca922276b4a4bc60 100644 (file)
--- 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 b942e4921436663a7f8282b9339d7dc2cd9387c1..06c04ab0bb01f45606713922bd2586938e26a631 100644 (file)
--- 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 42bdbf60dcdf8333a28d1fe8edebfb0b750f0c96..39676c7e092adb8c9a7bea45274b0fae03f2f810 100644 (file)
--- 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);
        }