Ticket #4381: mythtv-misc_status_info_popen-20080124.patch

programs/mythbackend/httpstatus.cpp

@@ -22 +22 @@
 #include <qfile.h>
 #include <qregexp.h>
 #include <qbuffer.h>
-#include <qprocess.h>
 #include <qlocale.h>
 #include <math.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
@@ -411 +411 @@
         QDomElement misc = pDoc->createElement("Miscellaneous");
         root.appendChild(misc);
 
-        QProcess miscellaneous_status_info_proc(info_script);
-        miscellaneous_status_info_proc.setCommunication(
-                                          QProcess::Stdout|QProcess::Stderr);
+        FILE *fp = popen(info_script.ascii(), "r");
 
-        if (miscellaneous_status_info_proc.start())
+        if (fp)
         {
-            int i = 0;
-            // Since the miscellaneous status information is not critical
-            // but creating the status document must wait for it, timeout
-            // if the script takes more than 10 seconds to execute.
-            while (miscellaneous_status_info_proc.isRunning() && i < 100)
+            char buffer[256];
+            int status;
+            QString input = "";
+
+            while (fgets(buffer, sizeof(buffer), fp))
             {
-                usleep(100000);
-                ++i;
+                input.append(QString::fromUtf8(buffer));
             }
 
-            if (miscellaneous_status_info_proc.normalExit())
+            if (pclose(fp))
             {
-                QString input = "";
-                while (miscellaneous_status_info_proc.canReadLineStdout())
-                {
-                    input = miscellaneous_status_info_proc.readLineStdout();
-                    if (input.isEmpty())
-                        continue;
+                VERBOSE(VB_IMPORTANT, QString("Error running miscellaneous "
+                        "status information script: %1").arg(info_script));
+            }
+            else
+            {
+                QStringList output = QStringList::split("\n", input, false);
 
+                QStringList::iterator iter = output.begin();
+                for (; iter != output.end(); iter++)
+                {
                     QDomElement info = pDoc->createElement("Information");
 
-                    QStringList list = QStringList::split("[]:[]", input, true);
+                    QStringList list = QStringList::split("[]:[]", *iter, true);
                     unsigned int size = list.size();
                     unsigned int hasAttributes = 0;
 
@@ -463 +463 @@
                         misc.appendChild(info);
                 }
             }
-            else
-            {
-                VERBOSE(VB_IMPORTANT, QString("Error running miscellaneous "
-                        "status information script or execution timed out: %1")
-                        .arg(info_script));
-            }
         }
         else
         {

contrib/misc_status_info/README

@@ -42 +42 @@
 If four (or more) fields are output on a line, the extra fields will be
 ignored.
 
-The script must provide output within 10 seconds or the Miscellaneous status
-information will not be included on the status page.  This timeout forces the
-status page to be returned in a reasonably short period of time regardless of
-the script specified.  If you would like to provide information that requires
-more than 10 seconds to compute (or that comes from a remote system whose
-response time is unknown), you may want to set up another script, i.e. in a
-cron job, and poll the data at appropriate intervals and write the output to a
-file, which could then be read (or simply cat'ed, if in the proper format) by
-the miscellaneous status script.
+The script should provide output quickly to ensure the status page is returned
+in a reasonably short period of time.  If you would like to provide information
+that requires a significant amount of time to compute (or that comes from a
+remote system whose response time is unknown), you may want to set up another
+script, i.e. in a cron job, and poll the data at appropriate intervals and
+write the output to a file, which could then be read (or simply cat'ed, if in
+the proper format) by the miscellaneous status script.
 
 Thermal Information
 -------------------