Ticket #2666: vb_idle.patch

libs/libmyth/mythcontext.h

@@ -79 +79 @@
     F(VB_MHEG,      0x00040000, "mheg",      1, "MHEG debugging messages")                 \
     F(VB_UPNP,      0x00080000, "upnp",      1, "upnp debugging messages")                 \
     F(VB_SOCKET,    0x00100000, "socket",    1, "socket debugging messages")               \
+    F(VB_IDLE,      0x00200000, "idle",      1, "System idle messages")                    \
     F(VB_TIMESTAMP, 0x80000000, "timestamp", 1, "Conditional data driven messages")        \
     F(VB_NONE,      0x00000000, "none",      0, "NO debug output")
 

programs/mythbackend/scheduler.cpp

@@ -1598 +1598 @@
                                 msg = QString("%1 secs left to system "
                                               "shutdown!")
                                              .arg(idleTimeoutSecs - itime);
-                                VERBOSE(VB_IMPORTANT, msg);
+                                VERBOSE(VB_IDLE, msg);
                                 MythEvent me(QString("SHUTDOWN_COUNTDOWN %1")
                                              .arg(idleTimeoutSecs - itime));
                                 gContext->dispatch(me);
@@ -1633 +1633 @@
     int state = 0;
     if (!preSDWUCheckCommand.isEmpty())
     {
+        QString msg;
         state = myth_system(preSDWUCheckCommand.ascii());
                       
         if (GENERIC_EXIT_NOT_OK != state)
@@ -1641 +1642 @@
             switch(state)
             {
                 case 0:
+                    msg = QString("Pre-shutdown check succeeded (retval = 0)");
                     retval = true;
                     break;
                 case 1:
                     // just reset idle'ing on retval == 1
+                    msg = QString("Pre-shutdown check returned 1; idle time "
+                                  "reset");
                     idleSince = QDateTime();
                     break;
                 case 2:
                     // reset shutdown status on retval = 2
                     // (needs a clientconnection again,
                     // before shutdown is executed)
+                    msg = QString("Pre-shutdown check returned 2; shutdown "
+                                  "sequence reset");
                     blockShutdown
                              = gContext->GetNumSetting("blockSDWUwithoutClient",
                                                        1);
@@ -1663 +1669 @@
                 default:
                     break;
             }
+            VERBOSE(VB_IDLE, msg);
         }
     }
     else