Have the --logpath propagate to subcalls

With this update, if you give --logpath (with a directory only), it will propagate that --logpath to calls to mythpreviewgen, mythcommflag, mythfilldatabase and mythtranscode. Others could potentially be added if there is the desire in calls to others as well.
MythTV · Jun 22, 2011 · 1edcab8 · 1edcab8
1 parent ad8ced5
commit 1edcab8
Show file tree

Hide file tree

Showing 23 changed files with 79 additions and 27 deletions.
diff --git a/mythplugins/mytharchive/mytharchivehelper/main.cpp b/mythplugins/mytharchive/mytharchivehelper/main.cpp
@@ -2639,7 +2639,8 @@ int main(int argc, char **argv)
             .arg(MYTH_SOURCE_VERSION));
 
     QString logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     gContext = new MythContext(MYTH_BINARY_VERSION);
     if (!gContext->Init(false))

diff --git a/mythplugins/mythnetvision/mythfillnetvision/main.cpp b/mythplugins/mythnetvision/mythfillnetvision/main.cpp
@@ -108,7 +108,8 @@ int main(int argc, char *argv[])
             .arg(MYTH_SOURCE_VERSION));
 
     QString logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     gContext = new MythContext(MYTH_BINARY_VERSION);
     if (!gContext->Init(false))

diff --git a/mythtv/libs/libmyth/mythcommandlineparser.cpp b/mythtv/libs/libmyth/mythcommandlineparser.cpp
@@ -1587,12 +1587,14 @@ QString MythCommandLineParser::GetLogFilePath(void)
     QFileInfo finfo(logfile);
     if (finfo.isDir())
     {
+        m_parsed.insert("islogpath", true);
         logdir  = finfo.filePath();
         logfile = QCoreApplication::applicationName() + 
                   QString(".%1").arg(pid) + ".log";
     }
     else
     {
+        m_parsed.insert("islogpath", false);
         logdir  = finfo.path();
         logfile = finfo.fileName();
     }

diff --git a/mythtv/libs/libmythbase/mythlogging.cpp b/mythtv/libs/libmythbase/mythlogging.cpp
@@ -5,6 +5,7 @@
 #include <QThread>
 #include <QHash>
 #include <QCoreApplication>
+#include <QFileInfo>
 
 #define _LogLevelNames_
 #include "mythlogging.h"
@@ -55,6 +56,9 @@ LoggerThread            logThread;
 bool                    logThreadFinished = false;
 bool                    debugRegistration = false;
 
+bool                    logPropagateFlag  = false;
+QString                 logPropagatePath;
+
 #define TIMESTAMP_MAX 30
 #define MAX_STRING_LENGTH 2048
 
@@ -718,15 +722,33 @@ void logSighup( int signum, siginfo_t *info, void *secret )
     }
 }
 
+bool logPropagate(void)
+{
+    return logPropagateFlag;
+}
 
-void logStart(QString logfile, int quiet, int facility, bool dblog)
+QString &logPropPath(void)
+{
+    return logPropagatePath;
+}
+
+void logStart(QString logfile, int quiet, int facility, bool dblog, 
+              bool propagate)
 {
     LoggerBase *logger;
     struct sigaction sa;
 
     if (logThread.isRunning())
         return;
 
+    logPropagateFlag = propagate;
+    if (propagate)
+    {
+        QFileInfo finfo(logfile);
+        logPropagatePath = finfo.path();
+        logPropagatePath.detach();
+    }
+
     /* log to the console */
     if( !quiet )
         logger = new FileLogger((char *)"-");

diff --git a/mythtv/libs/libmythbase/mythlogging.h b/mythtv/libs/libmythbase/mythlogging.h
@@ -103,8 +103,10 @@ MBASE_PUBLIC void LogPrintLine( uint32_t mask, LogLevel_t level,
 }
 
 MBASE_PUBLIC void logStart(QString logfile, int quiet = 0, int facility = 0,
-                           bool dblog = true);
+                           bool dblog = true, bool propagate = false);
 MBASE_PUBLIC void logStop(void);
+MBASE_PUBLIC bool logPropagate(void);
+MBASE_PUBLIC QString &logPropPath(void);
 MBASE_PUBLIC void threadRegister(QString name);
 MBASE_PUBLIC void threadDeregister(void);
 MBASE_PUBLIC int  syslogGetFacility(QString facility);

diff --git a/mythtv/libs/libmythtv/jobqueue.cpp b/mythtv/libs/libmythtv/jobqueue.cpp
@@ -1886,7 +1886,9 @@ void JobQueue::DoTranscodeThread(int jobID)
         QByteArray parg = profilearg.toAscii();
         command = QString("%1 -j %2 -V %3 -p %4 %5")
           .arg(path).arg(jobID).arg(print_verbose_messages)
-          .arg(parg.constData()).arg(useCutlist ? "-l" : "");
+          .arg(parg.constData()).arg(useCutlist ? "--honorcutlist" : "");
+        if (logPropagate())
+            command += QString(" --logpath %1").arg(logPropPath());
     }
     else
     {
@@ -2125,6 +2127,8 @@ void JobQueue::DoFlagCommercialsThread(int jobID)
         path = GetInstallPrefix() + "/bin/mythcommflag";
         command = QString("%1 -j %2 -V %3 --noprogress")
                           .arg(path).arg(jobID).arg(print_verbose_messages);
+        if (logPropagate())
+            command += QString(" --logpath %1").arg(logPropPath());
     }
     else
     {

diff --git a/mythtv/libs/libmythtv/previewgenerator.cpp b/mythtv/libs/libmythtv/previewgenerator.cpp
@@ -233,16 +233,18 @@ bool PreviewGenerator::Run(void)
             else
                 command += QString(" --frame %1").arg(captureTime);
         }
-        command += " ";
-        command += QString("--chanid %1 ").arg(programInfo.GetChanID());
-        command += QString("--starttime %1 ")
+        command += QString(" --chanid %1").arg(programInfo.GetChanID());
+        command += QString(" --starttime %1")
             .arg(programInfo.GetRecordingStartTime(MythDate));
 
         if (!outFileName.isEmpty())
-            command += QString("--outfile \"%1\" ").arg(outFileName);
+            command += QString(" --outfile \"%1\"").arg(outFileName);
 
         command += " --quiet";
 
+        if (logPropagate())
+            command += QString(" --logpath %1").arg(logPropPath());
+
         // Timeout in 30s
         uint ret = myth_system(command, kMSDontBlockInputDevs |
                                         kMSDontDisableDrawing |

diff --git a/mythtv/libs/libmythtv/sourceutil.cpp b/mythtv/libs/libmythtv/sourceutil.cpp
@@ -344,11 +344,13 @@ bool SourceUtil::IsAnySourceScanable(void)
 
 bool SourceUtil::UpdateChannelsFromListings(uint sourceid, QString cardtype)
 {
-    QString cmd = "mythfilldatabase --only-update-channels ";
+    QString cmd = "mythfilldatabase --only-update-channels";
     if (sourceid)
-        cmd += QString("--sourceid %1 ").arg(sourceid);
+        cmd += QString(" --sourceid %1").arg(sourceid);
     if (!cardtype.isEmpty())
-        cmd += QString("--cardtype %1 ").arg(cardtype);
+        cmd += QString(" --cardtype %1").arg(cardtype);
+    if (logPropagate())
+	cmd += QString(" --logpath %1").arg(logPropPath());
 
     myth_system(cmd);
 

diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
@@ -450,7 +450,7 @@ XMLTV_generic_config::XMLTV_generic_config(const VideoSource& _parent,
 void XMLTV_generic_config::Save()
 {
     VerticalConfigurationGroup::Save();
-/*
+#if 0
     QString err_msg = QObject::tr(
         "You MUST run 'mythfilldatabase --manual the first time,\n "
         "instead of just 'mythfilldatabase'.\nYour grabber does not provide "
@@ -462,7 +462,7 @@ void XMLTV_generic_config::Save()
         MythPopupBox::showOkPopup(
             GetMythMainWindow(), QObject::tr("Warning."), err_msg);
     }
-*/
+#endif
 }
 
 void XMLTV_generic_config::RunConfig(void)

diff --git a/mythtv/programs/mythavtest/main.cpp b/mythtv/programs/mythavtest/main.cpp
@@ -74,7 +74,8 @@ int main(int argc, char *argv[])
     bool dblog = !cmdline.toBool("nodblog");
 
     QString logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     if (!cmdline.toString("display").isEmpty())
     {

diff --git a/mythtv/programs/mythbackend/housekeeper.cpp b/mythtv/programs/mythbackend/housekeeper.cpp
@@ -422,6 +422,9 @@ void HouseKeeper::RunMFD(void)
 
     QString command = QString("%1 %2").arg(mfpath).arg(mfarg);
 
+    if (logPropagate())
+        command += QString(" --logpath %1").arg(logPropPath());
+
     if (mflog.length())
     {
         bool dir_writable = false;

diff --git a/mythtv/programs/mythbackend/main.cpp b/mythtv/programs/mythbackend/main.cpp
@@ -134,7 +134,8 @@ int main(int argc, char **argv)
     gContext = new MythContext(MYTH_BINARY_VERSION);
 
     logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     if (cmdline.toBool("event")         || cmdline.toBool("systemevent") ||
         cmdline.toBool("setverbose")    || cmdline.toBool("printsched") ||

diff --git a/mythtv/programs/mythcommflag/main.cpp b/mythtv/programs/mythcommflag/main.cpp
@@ -1108,7 +1108,8 @@ int main(int argc, char *argv[])
     CleanupGuard callCleanup(cleanup);
 
     QString logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     gContext = new MythContext(MYTH_BINARY_VERSION);
     if (!gContext->Init(

diff --git a/mythtv/programs/mythfilldatabase/main.cpp b/mythtv/programs/mythfilldatabase/main.cpp
@@ -283,7 +283,8 @@ int main(int argc, char *argv[])
     CleanupGuard callCleanup(cleanup);
 
     QString logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     gContext = new MythContext(MYTH_BINARY_VERSION);
     if (!gContext->Init(false))

diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
@@ -1463,7 +1463,8 @@ int main(int argc, char **argv)
     gContext = new MythContext(MYTH_BINARY_VERSION);
 
     logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     if (!cmdline.toBool("noupnp"))
     {

diff --git a/mythtv/programs/mythjobqueue/main.cpp b/mythtv/programs/mythjobqueue/main.cpp
@@ -130,7 +130,8 @@ int main(int argc, char *argv[])
     CleanupGuard callCleanup(cleanup);
 
     logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     ofstream pidfs;
     if (pidfile.size())

diff --git a/mythtv/programs/mythlcdserver/main.cpp b/mythtv/programs/mythlcdserver/main.cpp
@@ -81,7 +81,8 @@ int main(int argc, char **argv)
     bool dblog = !cmdline.toBool("nodblog");
 
     logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
 
     if (cmdline.toBool("port"))

diff --git a/mythtv/programs/mythmediaserver/main.cpp b/mythtv/programs/mythmediaserver/main.cpp
@@ -131,7 +131,8 @@ int main(int argc, char *argv[])
     CleanupGuard callCleanup(cleanup);
 
     QString logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     ofstream pidfs;
     if (pidfile.size())

diff --git a/mythtv/programs/mythpreviewgen/main.cpp b/mythtv/programs/mythpreviewgen/main.cpp
@@ -217,7 +217,8 @@ int main(int argc, char **argv)
     CleanupGuard callCleanup(cleanup);
 
     QString logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         VERBOSE(VB_IMPORTANT, LOC_WARN + "Unable to ignore SIGPIPE");

diff --git a/mythtv/programs/mythshutdown/main.cpp b/mythtv/programs/mythshutdown/main.cpp
@@ -818,7 +818,8 @@ int main(int argc, char **argv)
     }
 
     QString logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     gContext = new MythContext(MYTH_BINARY_VERSION);
     if (!gContext->Init(false))

diff --git a/mythtv/programs/mythtranscode/main.cpp b/mythtv/programs/mythtranscode/main.cpp
@@ -299,7 +299,8 @@ int main(int argc, char *argv[])
     bool dblog = !cmdline.toBool("nodblog");
 
     QString logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     //  Load the context
     MythContext context(MYTH_BINARY_VERSION);

diff --git a/mythtv/programs/mythtv-setup/main.cpp b/mythtv/programs/mythtv-setup/main.cpp
@@ -311,7 +311,8 @@ int main(int argc, char *argv[])
         scanInputName = cmdline.toString("inputname");
 
     logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     if (!display.isEmpty())
     {

diff --git a/mythtv/programs/mythwelcome/main.cpp b/mythtv/programs/mythwelcome/main.cpp
@@ -93,7 +93,8 @@ int main(int argc, char **argv)
     bool dblog = !cmdline.toBool("nodblog");
 
     logfile = cmdline.GetLogFilePath();
-    logStart(logfile, quiet, facility, dblog);
+    bool propagate = cmdline.toBool("islogpath");
+    logStart(logfile, quiet, facility, dblog, propagate);
 
     gContext = new MythContext(MYTH_BINARY_VERSION);
     if (!gContext->Init())