]> xenbits.xensource.com Git - libvirt.git/commitdiff
Improve logging of shutdown inhibitor
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 23 Jun 2017 15:21:50 +0000 (16:21 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Wed, 5 Jul 2017 12:12:22 +0000 (13:12 +0100)
The log category for virnetdaemon.c was mistakenly set
to rpc.netserver. Some useful info about the inhibitor
file descriptor was also never logged.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/rpc/virnetdaemon.c

index 782417ef66f017bacbe490f48fbf47e3d03a36b8..e805e3a3ca5adf5dc193e5f5640032322ccab7e9 100644 (file)
@@ -47,7 +47,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 
-VIR_LOG_INIT("rpc.netserver");
+VIR_LOG_INIT("rpc.netdaemon");
 
 typedef struct _virNetDaemonSignal virNetDaemonSignal;
 typedef virNetDaemonSignal *virNetDaemonSignalPtr;
@@ -460,8 +460,10 @@ virNetDaemonGotInhibitReply(DBusPendingCall *pending,
                               DBUS_TYPE_INVALID)) {
         if (dmn->autoShutdownInhibitions) {
             dmn->autoShutdownInhibitFd = fd;
+            VIR_DEBUG("Got inhibit FD %d", fd);
         } else {
             /* We stopped the last VM since we made the inhibit call */
+            VIR_DEBUG("Closing inhibit FD %d", fd);
             VIR_FORCE_CLOSE(fd);
         }
     }
@@ -550,8 +552,10 @@ virNetDaemonRemoveShutdownInhibition(virNetDaemonPtr dmn)
 
     VIR_DEBUG("dmn=%p inhibitions=%zu", dmn, dmn->autoShutdownInhibitions);
 
-    if (dmn->autoShutdownInhibitions == 0)
+    if (dmn->autoShutdownInhibitions == 0) {
+        VIR_DEBUG("Closing inhibit FD %d", dmn->autoShutdownInhibitFd);
         VIR_FORCE_CLOSE(dmn->autoShutdownInhibitFd);
+    }
 
     virObjectUnlock(dmn);
 }