From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 16 Dec 2017 13:39:12 +0000 (+0100)
Subject: start: log closing cmd socket and STOPPED state
X-Git-Tag: lxc-3.0.0.beta1~94^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2042%2Fhead;p=thirdparty%2Flxc.git

start: log closing cmd socket and STOPPED state

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

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 5327e44b2..83991cf53 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -784,11 +784,6 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
 
 	cgroup_destroy(handler);
 
-	/* This function will try to connect to the legacy lxc-monitord state
-	 * server and only exists for backwards compatibility.
-	 */
-	lxc_monitor_send_state(name, STOPPED, handler->lxcpath);
-
 	if (handler->conf->reboot == 0) {
 		/* For all new state clients simply close the command socket.
 		 * This will inform all state clients that the container is
@@ -798,6 +793,18 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
 		 */
 		close(handler->conf->maincmd_fd);
 		handler->conf->maincmd_fd = -1;
+		TRACE("Closed command socket");
+
+		/* This function will try to connect to the legacy lxc-monitord
+		 * state server and only exists for backwards compatibility.
+		 */
+		lxc_monitor_send_state(name, STOPPED, handler->lxcpath);
+
+		/* The command socket is closed so no one can acces the command
+		 * socket anymore so there's no need to lock it.
+		 */
+		handler->state = STOPPED;
+		TRACE("Set container state to \"STOPPED\"");
 	} else {
 		lxc_set_state(name, handler, STOPPED);
 	}