chiark / gitweb /
core/socket: log errors when starting socket for this socket
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 1 Apr 2013 02:44:45 +0000 (22:44 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 1 Apr 2013 04:37:48 +0000 (00:37 -0400)
When showing an error like 'Socket service not loaded', the
error won't show up in the status for the socket, unless it is
marked as SYSTEMD_UNIT=*.socket. Marking it as SYSTEMD_UNIT=*.service,
when the service is non-existent, is not useful.

src/core/socket.c

index 31f4bf4..d6d531d 100644 (file)
@@ -1634,7 +1634,7 @@ static int socket_start(Unit *u) {
                 service = SERVICE(UNIT_DEREF(s->service));
 
                 if (UNIT(service)->load_state != UNIT_LOADED) {
-                        log_error_unit(UNIT(service)->id,
+                        log_error_unit(u->id,
                                        "Socket service %s not loaded, refusing.",
                                        UNIT(service)->id);
                         return -ENOENT;
@@ -1645,7 +1645,7 @@ static int socket_start(Unit *u) {
                 if (service->state != SERVICE_DEAD &&
                     service->state != SERVICE_FAILED &&
                     service->state != SERVICE_AUTO_RESTART) {
-                        log_error_unit(UNIT(service)->id,
+                        log_error_unit(u->id,
                                        "Socket service %s already active, refusing.",
                                        UNIT(service)->id);
                         return -EBUSY;
@@ -1653,7 +1653,7 @@ static int socket_start(Unit *u) {
 
 #ifdef HAVE_SYSV_COMPAT
                 if (service->is_sysv) {
-                        log_error_unit(UNIT(s)->id,
+                        log_error_unit(u->id,
                                        "Using SysV services for socket activation is not supported. Refusing.");
                         return -ENOENT;
                 }