Ticket #4184: 4184 mythtv-setup-autorestartbackend-29122007.2.patch

libs/libmyth/mythcontext.cpp

@@ -34 +34 @@
 #include "util-x11.h"
 #include "mythsocket.h"
 #include "themeinfo.h"
+#include "util.h"
 
 #include "libmythui/mythmainwindow.h"
 #include "libmythupnp/mythxmlclient.h"
@@ -1518 +1519 @@
                                        bool blockingClient)
 {
     MythSocket *serverSock = NULL;
+    MythBusyDialog *busy = NULL;
     int cnt = 1;
+    
+    bool enableGUI=false;
+    if(GetMainWindow())
+        enableGUI=true;
+    else
+        enableGUI=false;
 
     int sleepTime = GetNumSetting("WOLbackendReconnectWaitTime", 0);
     int maxConnTry = GetNumSetting("WOLbackendConnectRetry", 1);
@@ -1557 +1565 @@
                         manageLock = true;
                         d->serverSockLock.unlock();
                     }
-                    MythPopupBox::showOkPopup(d->mainWindow, 
+                    if (GetMainWindow())
+                        MythPopupBox::showOkPopup(d->mainWindow,  
                                               "connection failure",
                                               tr("Could not connect to the "
                                                  "master backend server -- is "
@@ -1573 +1582 @@
             }
             else
             {
+                QString wol_cmd;
+                QString waitString=QObject::tr("Waiting for Server...");
+                
+                if (GetMainWindow())
+                {
+                    busy = new MythBusyDialog(waitString);
+                    busy->start(1);
+                }
+
                 VERBOSE(VB_GENERAL, "Trying to wake up the MasterBackend "
                                     "now.");
-                QString wol_cmd = GetSetting("WOLbackendCommand",
-                                             "echo \'would run the "
-                                             "WakeServerCommand now, if "
-                                             "set!\'");
-                myth_system(wol_cmd);
-
-                VERBOSE(VB_GENERAL, QString("Waiting for %1 seconds until I "
-                                            "try to reconnect again.")
-                                            .arg(sleepTime));
-                sleep(sleepTime);
+                 
+                /* If this is run from the master backend, use local command
+                * to start backend (eg. /etc/init.d/mythtv-backend start).
+                * Otherwise use WakeOnLan command to start backend remotely.
+                */
+                if (gContext->IsMasterHost())
+                    wol_cmd = GetSetting("MythbackendStartCommand", 
+                                                 "mythbackend");
+                else 
+                    wol_cmd = GetSetting("WOLbackendCommand",
+                                             "echo \'would run the WakeServerCommand now, "
+                                             "if set!\'");
+ 
+                // Don't restart the backend if setup is running
+                if ( ! isRunning("mythtv-setup") )
+                {
+                    //busy->setLabel(waitString);
+                    system(wol_cmd.ascii());
+                    cout << wol_cmd.ascii();
+                }
+                //else
+                //    busy->setLabel(QObject::tr("Setup is Running.  Not restarting backend until setup is finished!"));
+                
+                VERBOSE(VB_GENERAL, QString("Waiting for %1 seconds before I send wake command again.")
+                                             .arg(sleepTime));
+                
+                int sleepCount = 0;
+                serverSock = new MythSocket();                
+                while (!serverSock->connect(hostname, port))
+                {
+                    sleep(1);
+                    sleepCount++;
+                    if (sleepCount > sleepTime)
+                        break;
+                }
+                serverSock->DownRef();
+                serverSock = NULL;                        
                 ++cnt;
-            }
-            d->attemptingToConnect = false;
+                if (GetMainWindow())
+                {
+                    busy->Close();
+                    busy->deleteLater();
+                }
+           }
+           d->attemptingToConnect = false;
         }
         else
             break;

programs/mythtv-setup/main.cpp

@@ -294 +294 @@
     gContext->UpdateImageCache();
     MythThemeBase *themeBase = new MythThemeBase();
     (void) themeBase;
+    DialogBox *dia = NULL;
+    QString stCmd;
+    int val = 0;
 
     LanguageSettings::prompt();
     LanguageSettings::load("mythfrontend");
@@ -302 +305 @@
         QObject::tr("WARNING") + ": " +
         QObject::tr("MythTV has detected that the backend is running.")+"\n\n"+
         QObject::tr("Changing existing card inputs, deleting anything, "
-                    "or scanning for channels may not work.");
-
-    bool backendIsRunning = gContext->BackendIsRunning();
-
-    if (backendIsRunning)
+                    "or scanning for channels may not work.")+"\n\n"+
+        QObject::tr("It is strongly advised that you stop the backend whilst running setup!");
+  
+    bool restartBackend=false;
+    
+    // Offer to stop the backend if sensible
+    if (gContext->BackendIsRunning() && gContext->IsMasterHost())
     {
-        DialogCode val = MythPopupBox::Show2ButtonPopup(
-            mainWindow, QObject::tr("WARNING"), warn,
-            QObject::tr("Continue"),
-            QObject::tr("Exit"), kDialogCodeButton0);
-
-        if (kDialogCodeButton1 == val)
-            return 0;
+        dia = new DialogBox(mainWindow, warn);
+        dia->AddButton(QObject::tr("Stop backend and continue"));
+        dia->AddButton(QObject::tr("Continue anyway"));
+        dia->AddButton(QObject::tr("Exit"));
+        val = dia->exec();
+        dia->deleteLater();
+        
+        if (val == kDialogCodeButton0) // Stop Backend
+        {
+            stCmd = gContext->GetSetting("MythbackendStopCommand", "killall mythbackend");
+            if (!stCmd.isEmpty())
+                myth_system(stCmd);
+            restartBackend=true;
+        }
+        else if (val == kDialogCodeButton1) // Continue anyway
+        {
+            restartBackend=false;   
+        }
+        else // Exit
+        {
+            return 1;
+        }
     }
 
     REG_KEY("qt", "DELETE", "Delete", "D");

programs/mythtv-setup/backendsettings.cpp

@@ -356 +356 @@
 static GlobalLineEdit *WOLbackendCommand()
 {
     GlobalLineEdit *gc = new GlobalLineEdit("WOLbackendCommand");
-    gc->setLabel(QObject::tr("Wake Command"));
+    gc->setLabel(QObject::tr("WOL Wake Command"));
     gc->setValue("");
     gc->setHelpText(QObject::tr("The command used to wake up your master "
-                    "backend server\n(eg. sudo /etc/init.d/mythtv-backend restart)."));
+                    "backend server from another machine.\n (Leave blank to disable)."));
     return gc;
 };
 
@@ -369 +369 @@
     gc->setLabel(QObject::tr("Wake command"));
     gc->setValue("");
     gc->setHelpText(QObject::tr("The command used to wakeup your slave "
-                    "backends. Leave empty to disable."));
+                    "backends.\n (Leave blank to disable)."));
     return gc;
 };
 
+static GlobalLineEdit *MythbackendStopCommand()
+{
+    GlobalLineEdit *gc = new GlobalLineEdit("MythbackendStopCommand");
+    gc->setLabel(QObject::tr("Backend Stop Command"));
+    gc->setValue("killall mythbackend");
+    gc->setHelpText(QObject::tr("The command used to stop the backend when running on "
+                    "the master backend server\n(eg. sudo /etc/init.d/mythtv-backend stop)."));
+    return gc;
+};
+
+static GlobalLineEdit *MythbackendStartCommand()
+{
+    GlobalLineEdit *gc = new GlobalLineEdit("MythbackendStartCommand");
+    gc->setLabel(QObject::tr("Backend Start Command"));
+    gc->setValue("mythbackend");
+    gc->setHelpText(QObject::tr("The command used to start the backend when running on "
+                    "the master backend server\n(eg. sudo /etc/init.d/mythtv-backend start)."));
+    return gc;
+};
+
 static GlobalSpinBox *idleTimeoutSecs()
 {
     GlobalSpinBox *gc = new GlobalSpinBox("idleTimeoutSecs", 0, 1200, 5);
@@ -723 +743 @@
     backend->addChild(WOLbackendReconnectWaitTime());
     backend->addChild(WOLbackendConnectRetry());
     backend->addChild(WOLbackendCommand());
+    backend->addChild(MythbackendStopCommand());
+    backend->addChild(MythbackendStartCommand());
     group4->addChild(backend);
     
     VerticalConfigurationGroup* slaveBackend = new VerticalConfigurationGroup();