Ticket #11026: 11026_1.patch

mythtv/libs/libmythbase/logging.cpp

@@ -88 +88 @@
 
 LogPropagateOpts        logPropagateOpts;
 QString                 logPropagateArgs;
+QStringList             logPropagateArgList;
 
 #define TIMESTAMP_MAX 30
 #define MAX_STRING_LENGTH (LOGLINE_MAX+120)
@@ -776 +777 @@
 ///        spawned from this one.
 void logPropagateCalc(void)
 {
+    logPropagateArgList.clear();
+
     QString mask = verboseString.trimmed();
     mask.replace(QRegExp(" "), ",");
     mask.remove(QRegExp("^,"));
     logPropagateArgs = " --verbose " + mask;
+    logPropagateArgList << "--verbose" << mask;
 
     if (logPropagateOpts.propagate)
+    {
         logPropagateArgs += " --logpath " + logPropagateOpts.path;
+        logPropagateArgList << "--logpath" << logPropagateOpts.path;
+    }
 
     QString name = logLevelGetName(logLevel);
     logPropagateArgs += " --loglevel " + name;
+    logPropagateArgList << "--loglevel" << name;
 
     for (int i = 0; i < logPropagateOpts.quiet; i++)
+    {
         logPropagateArgs += " --quiet";
+        logPropagateArgList << "--quiet";
+    }
 
     if (!logPropagateOpts.dblog)
+    {
         logPropagateArgs += " --nodblog";
+        logPropagateArgList << "--nodblog";
+    }
 
 #ifndef _WIN32
     if (logPropagateOpts.facility >= 0)
@@ -803 +817 @@
               syslogname->c_val != logPropagateOpts.facility); syslogname++);
 
         logPropagateArgs += QString(" --syslog %1").arg(syslogname->c_name);
+        logPropagateArgList << "--syslog" << syslogname->c_name;
     }
 #endif
 }

mythtv/libs/libmythbase/mythlogging.h

@@ -3 +3 @@
 
 #ifdef __cplusplus
 #include <QString>
+#include <QStringList>
 #endif
 #include <stdint.h>
 #include <errno.h>
@@ -60 +61 @@
 #ifdef __cplusplus
 }
 
-extern MBASE_PUBLIC QString    logPropagateArgs;
-extern MBASE_PUBLIC QString    verboseString;
+extern MBASE_PUBLIC QStringList logPropagateArgList;
+extern MBASE_PUBLIC QString     logPropagateArgs;
+extern MBASE_PUBLIC QString     verboseString;
 
 MBASE_PUBLIC void logStart(QString logfile, int progress = 0, int quiet = 0,
                            int facility = 0, LogLevel_t level = LOG_INFO,

mythtv/libs/libmythbase/mythsystem.cpp

@@ -105 +105 @@
 
     ProcessFlags(flags);
 
+    // add logging arguments
+    if (GetSetting("PropagateLogs"))
+    {
+        if (m_args.isEmpty())
+        {
+            m_command += logPropagateArgs;
+            if (!logPropagateQuiet())
+                m_command += " --quiet";
+        }
+        else
+        {
+            m_args << logPropagateArgList;
+            if (!logPropagateQuiet())
+                m_args << "--quiet";
+        }
+    }
+
     // check for execute rights
     if (!GetSetting("UseShell") && access(command.toUtf8().constData(), X_OK))
     {
@@ -320 +337 @@
         m_settings["AnonLog"] = true;
     if( flags & kMSLowExitVal )
         m_settings["OnlyLowExitVal"] = true;
+    if( flags & kMSPropagateLogs )
+        m_settings["PropagateLogs"] = true;
 }
 
 QByteArray  MythSystem::Read(int size)

mythtv/libs/libmythbase/mythsystem.h

@@ -26 +26 @@
     kMSLowExitVal         = 0x00008000, ///< allow exit values 0-127 only
     kMSDisableUDPListener = 0x00010000, ///< disable MythMessage UDP listener
                                         ///  for the duration of application.
+    kMSPropagateLogs      = 0x00020000, ///< add arguments for MythTV log
+                                        ///  propagation
 } MythSystemFlag;
 
 #ifdef __cplusplus

mythtv/libs/libmythtv/previewgenerator.cpp

@@ -224 +224 @@
     else
     {
         // This is where we fork and run mythpreviewgen to actually make preview
-        command += QString(" --size %1x%2")
-            .arg(outSize.width()).arg(outSize.height());
+        QStringList cmdargs;
+
+        cmdargs << "--size"
+                << QString("%1x%2").arg(outSize.width()).arg(outSize.height());
         if (captureTime >= 0)
         {
             if (timeInSeconds)
-                command += QString(" --seconds %1").arg(captureTime);
+                cmdargs << "--seconds";
             else
-                command += QString(" --frame %1").arg(captureTime);
+                cmdargs << "--frame";
+            cmdargs << QString::number(captureTime);
         }
-        command += QString(" --chanid %1").arg(programInfo.GetChanID());
-        command += QString(" --starttime %1")
-            .arg(programInfo.GetRecordingStartTime(MythDate::kFilename));
+        cmdargs << "--chanid"
+                << QString::number(programInfo.GetChanID())
+                << "--starttime"
+                << programInfo.GetRecordingStartTime(MythDate::kFilename);
 
         if (!outFileName.isEmpty())
-            command += QString(" --outfile \"%1\"").arg(outFileName);
-
-        command += logPropagateArgs;
-        if (!logPropagateQuiet())
-            command += " --quiet";
+            cmdargs << "--outfile" << outFileName;
 
         // Timeout in 30s
-        uint ret = myth_system(command, kMSDontBlockInputDevs |
+        MythSystem *ms = new MythSystem(command, cmdargs,
+                                        kMSDontBlockInputDevs |
                                         kMSDontDisableDrawing |
-                                        kMSProcessEvents, 30);
+                                        kMSProcessEvents      |
+                                        kMSNoRunShell         |
+                                        kMSAutoCleanup        |
+                                        kMSPropagateLogs);
+        ms->SetNice(10);
+        ms->SetIOPrio(7);
+
+        ms->Run(30);
+        uint ret = ms->Wait();
+        delete ms;
+
         if (ret != GENERIC_EXIT_OK)
         {
             LOG(VB_GENERAL, LOG_ERR, LOC +