commands: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 0a0f0d82e93c6a238c791b514c53c44e328c609b..e955236f7ba628f2465f9576c55c91c56beac9ce 100644 (file)
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -220,7 +220,7 @@ static int lxc_cmd_send(const char *name, struct lxc_cmd_rr *cmd,
        int client_fd;
        ssize_t ret = -1;
 
-       client_fd = lxc_cmd_connect(name, lxcpath, hashed_sock_name);
+       client_fd = lxc_cmd_connect(name, lxcpath, hashed_sock_name, "command");
        if (client_fd < 0) {
                if (client_fd == -ECONNREFUSED)
                        return -ECONNREFUSED;
@@ -1063,8 +1063,7 @@ out_close:
        goto out;
 }
 
-int lxc_cmd_init(const char *name, struct lxc_handler *handler,
-                const char *lxcpath)
+int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix)
 {
        int fd, len, ret;
        char path[sizeof(((struct sockaddr_un *)0)->sun_path)] = {0};
@@ -1076,9 +1075,10 @@ int lxc_cmd_init(const char *name, struct lxc_handler *handler,
         * because we print the sockname out sometimes.
         */
        len = sizeof(path) - 2;
-       ret = lxc_make_abstract_socket_name(offset, len, name, lxcpath, NULL, "command");
+       ret = lxc_make_abstract_socket_name(offset, len, name, lxcpath, NULL, suffix);
        if (ret < 0)
                return -1;
+       TRACE("Creating abstract unix socket \"%s\"", offset);
 
        fd = lxc_abstract_unix_open(path, SOCK_STREAM, 0);
        if (fd < 0) {
@@ -1096,8 +1096,7 @@ int lxc_cmd_init(const char *name, struct lxc_handler *handler,
                return -1;
        }
 
-       handler->conf->maincmd_fd = fd;
-       return 0;
+       return fd;
 }
 
 int lxc_cmd_mainloop_add(const char *name, struct lxc_epoll_descr *descr,

diff --git a/src/lxc/commands.h b/src/lxc/commands.h
index 28428c774e788f024dfce0c3c2f659ad8eff599c..dfcc6707ecdda9cc6a8611e6660914a48dbb3940 100644 (file)
--- a/src/lxc/commands.h
+++ b/src/lxc/commands.h
@@ -110,8 +110,7 @@ extern int lxc_cmd_add_state_client(const char *name, const char *lxcpath,
 struct lxc_epoll_descr;
 struct lxc_handler;
 
-extern int lxc_cmd_init(const char *name, struct lxc_handler *handler,
-                           const char *lxcpath);
+extern int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix);
 extern int lxc_cmd_mainloop_add(const char *name, struct lxc_epoll_descr *descr,
                                    struct lxc_handler *handler);
 extern int lxc_try_cmd(const char *name, const char *lxcpath);

diff --git a/src/lxc/commands_utils.c b/src/lxc/commands_utils.c
index 23a0b95049daa566c7b0e90a61955010849a00d5..30c224519365584249688bbed029c8e09f394aa1 100644 (file)
--- a/src/lxc/commands_utils.c
+++ b/src/lxc/commands_utils.c
@@ -68,16 +68,14 @@ again:
                        goto again;
                }
 
-               ERROR("failed to receive message: %s", strerror(errno));
+               ERROR("Failed to receive message: %s", strerror(errno));
                return -1;
        }
 
-       if (ret == 0) {
-               ERROR("length of message was 0");
+       if (ret < 0)
                return -1;
-       }
 
-       TRACE("received state %s from state client %d",
+       TRACE("Received state %s from state client %d",
              lxc_state2str(msg.value), state_client_fd);
 
        return msg.value;
@@ -163,7 +161,7 @@ int lxc_make_abstract_socket_name(char *path, int len, const char *lxcname,
 }
 
 int lxc_cmd_connect(const char *name, const char *lxcpath,
-                   const char *hashed_sock_name)
+                   const char *hashed_sock_name, const char *suffix)
 {
        int ret, client_fd;
        char path[sizeof(((struct sockaddr_un *)0)->sun_path)] = {0};
@@ -176,7 +174,7 @@ int lxc_cmd_connect(const char *name, const char *lxcpath,
         */
        size_t len = sizeof(path) - 2;
        ret = lxc_make_abstract_socket_name(offset, len, name, lxcpath,
-                                           hashed_sock_name, "command");
+                                           hashed_sock_name, suffix);
        if (ret < 0)
                return -1;
 

diff --git a/src/lxc/commands_utils.h b/src/lxc/commands_utils.h
index 134a0d73a6f054f61a815f0f406cb4f0418dfc4a..d54cb11f36eee0b3112f6123cadb233136ae626e 100644 (file)
--- a/src/lxc/commands_utils.h
+++ b/src/lxc/commands_utils.h
@@ -79,6 +79,6 @@ extern int lxc_add_state_client(int state_client_fd,
  *                                     >= 0 client fd
  */
 extern int lxc_cmd_connect(const char *name, const char *lxcpath,
-                          const char *hashed_sock_name);
+                          const char *hashed_sock_name, const char *suffix);
 
 #endif /* __LXC_COMMANDS_UTILS_H */

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 609ec565b7212183d74c4b56bfe30a184b6dc5d3..8865194e471f03bd18cba97cddeda7738742f12a 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -357,10 +357,10 @@ static int lxc_serve_state_clients(const char *name,
        *  lxc_cmd_add_state_client() to miss a state.
         */
        handler->state = state;
-       TRACE("set container state to %s", lxc_state2str(state));
+       TRACE("Set container state to %s", lxc_state2str(state));
 
        if (lxc_list_empty(&handler->state_clients)) {
-               TRACE("no state clients registered");
+               TRACE("No state clients registered");
                process_unlock();
                lxc_monitor_send_state(name, state, handler->lxcpath);
                return 0;
@@ -373,12 +373,12 @@ static int lxc_serve_state_clients(const char *name,
                client = cur->elem;
 
                if (!client->states[state]) {
-                       TRACE("state %s not registered for state client %d",
+                       TRACE("State %s not registered for state client %d",
                              lxc_state2str(state), client->clientfd);
                        continue;
                }
 
-               TRACE("sending state %s to state client %d",
+               TRACE("Sending state %s to state client %d",
                      lxc_state2str(state), client->clientfd);
 
        again:
@@ -389,7 +389,8 @@ static int lxc_serve_state_clients(const char *name,
                                goto again;
                        }
 
-                       ERROR("failed to send message to client");
+                       ERROR("%s - Failed to send message to client",
+                             strerror(errno));
                }
 
                /* kick client from list */
@@ -573,12 +574,12 @@ struct lxc_handler *lxc_init_handler(const char *name, struct lxc_conf *conf,
                      handler->state_socket_pair[1]);
        }
 
-       if (lxc_cmd_init(name, handler, lxcpath)) {
-               ERROR("failed to set up command socket");
+       handler->conf->maincmd_fd = lxc_cmd_init(name, lxcpath, "command");
+       if (handler->conf->maincmd_fd < 0) {
+               ERROR("Failed to set up command socket");
                goto on_error;
        }
-
-       TRACE("unix domain socket %d for command server is ready",
+       TRACE("Unix domain socket %d for command server is ready",
              handler->conf->maincmd_fd);
 
        return handler;