Changeset f124159c7 in mythtv

Timestamp:

Aug 27, 2013, 4:16:29 AM (11 years ago)

Author:

Jean-Yves Avenard <jyavenard@…>

Branches:

devel/2020-player, devel/ffmpeg-resync, fixes/0.27, fixes/0.28, fixes/29, fixes/30, fixes/31, github-templates, master

Children:

3a73d8919

Parents:

a74baed2b

Message:

Add —nologserver option

This will limit all logs to console, disabling file, db and syslog.
If enabled, mythlogserver will never be started; or if built without mythlogserver, two extra threads won’t be created

Ref #11230 and #11784: not a fix, but allow to bypass the issue

Files:

• mythplugins/mytharchive/mytharchive/archiveutil.cpp (modified) (1 diff)
• mythplugins/mytharchive/mytharchive/mythburn.cpp (modified) (1 diff)
• mythtv/libs/libmythbase/logging.cpp (modified) (12 diffs)
• mythtv/libs/libmythbase/logging.h (modified) (2 diffs)
• mythtv/libs/libmythbase/mythcommandlineparser.cpp (modified) (4 diffs)
• mythtv/libs/libmythbase/mythlogging.h (modified) (1 diff)
• mythtv/libs/libmythbase/mythsystemlegacy.cpp (modified) (2 diffs)

mythplugins/mytharchive/mytharchive/archiveutil.cpp

@@ -251 +251 @@
     if (logPropagateQuiet())
         command += " --quiet";
+    if (logPropagateNoServer())
+        command += " --nologserver";
 
     uint flags = kMSDontBlockInputDevs | kMSDontDisableDrawing;

mythplugins/mytharchive/mytharchive/mythburn.cpp

@@ -1222 +1222 @@
     if (logPropagateQuiet())
         commandline += " --quiet";
+    if (logPropagateNoServer())
+        commandline += " --nologserver";
     commandline += " > "  + logDir + "/progress.log 2>&1 &";
 

mythtv/libs/libmythbase/logging.cpp

@@ -82 +82 @@
     bool    dblog;
     QString path;
+    bool    noserver;
 } LogPropagateOpts;
 
@@ -251 +252 @@
 ///        set.
 LoggerThread::LoggerThread(QString filename, bool progress, bool quiet,
-                           QString table, int facility) :
+                           QString table, int facility, bool noserver) :
     MThread("Logger"),
     m_waitNotEmpty(new QWaitCondition()),
@@ -260 +261 @@
     m_tablename(table), m_facility(facility), m_pid(getpid()), m_epoch(0),
     m_zmqContext(NULL), m_zmqSocket(NULL), m_initialTimer(NULL),
-    m_heartbeatTimer(NULL)
+    m_heartbeatTimer(NULL), m_noserver(noserver)
 {
     char *debug = getenv("VERBOSE_THREADS");
@@ -272 +273 @@
 
 #ifdef NOLOGSERVER
-    if (!logServerStart())
+    if (!m_noserver && !logServerStart())
     {
         LOG(VB_GENERAL, LOG_ERR,
@@ -288 +289 @@
 
 #ifdef NOLOGSERVER
-    logServerStop();
+    if (!m_noserver)
+    {
+        logServerStop();
+    }
 #endif
     delete m_waitNotEmpty;
@@ -308 +312 @@
     bool dieNow = false;
 
+    if (!m_noserver)
+    {
 #ifndef NOLOGSERVER
-    try
-    {
-        if (m_locallogs)
-        {
-            logServerWait();
-            m_zmqContext = logServerThread->getZMQContext();
-        }
-        else
-        {
-            m_zmqContext = nzmqt::createDefaultContext(NULL);
-            m_zmqContext->start();
-        }
-
-        if (!m_zmqContext)
-        {
+        try
+        {
+            if (m_locallogs)
+            {
+                logServerWait();
+                m_zmqContext = logServerThread->getZMQContext();
+            }
+            else
+            {
+                m_zmqContext = nzmqt::createDefaultContext(NULL);
+                m_zmqContext->start();
+            }
+
+            if (!m_zmqContext)
+            {
+                m_aborted = true;
+                dieNow = true;
+            }
+            else
+            {
+                qRegisterMetaType<QList<QByteArray> >("QList<QByteArray>");
+
+                m_zmqSocket =
+                    m_zmqContext->createSocket(nzmqt::ZMQSocket::TYP_DEALER, this);
+                connect(m_zmqSocket,
+                        SIGNAL(messageReceived(const QList<QByteArray>&)),
+                        SLOT(messageReceived(const QList<QByteArray>&)),
+                        Qt::QueuedConnection);
+
+                if (m_locallogs)
+                    m_zmqSocket->connectTo("inproc://mylogs");
+                else
+                    m_zmqSocket->connectTo("tcp://127.0.0.1:35327");
+            }
+        }
+        catch (nzmqt::ZMQException &e)
+        {
+            cerr << "Exception during logging socket setup: " << e.what() << endl;
             m_aborted = true;
             dieNow = true;
         }
-        else
-        {
-            qRegisterMetaType<QList<QByteArray> >("QList<QByteArray>");
-
-            m_zmqSocket =
-                m_zmqContext->createSocket(nzmqt::ZMQSocket::TYP_DEALER, this);
-            connect(m_zmqSocket,
-                    SIGNAL(messageReceived(const QList<QByteArray>&)),
-                    SLOT(messageReceived(const QList<QByteArray>&)),
-                    Qt::QueuedConnection);
-
-            if (m_locallogs)
-                m_zmqSocket->connectTo("inproc://mylogs");
+
+        if (!m_aborted)
+        {
+            if (!m_locallogs)
+            {
+                m_initialWaiting = true;
+                pingLogServer();
+
+                // wait up to 150ms for mythlogserver to respond
+                m_initialTimer = new MythSignalingTimer(this,
+                                                        SLOT(initialTimeout()));
+                m_initialTimer->start(150);
+            }
             else
-                m_zmqSocket->connectTo("tcp://127.0.0.1:35327");
-        }
-    }
-    catch (nzmqt::ZMQException &e)
-    {
-        cerr << "Exception during logging socket setup: " << e.what() << endl;
-        m_aborted = true;
-        dieNow = true;
-    }
-
-    if (!m_aborted)
-    {
-        if (!m_locallogs)
-        {
-            m_initialWaiting = true;
-            pingLogServer();
-
-            // wait up to 150ms for mythlogserver to respond
-            m_initialTimer = new MythSignalingTimer(this,
-                                                    SLOT(initialTimeout()));
-            m_initialTimer->start(150);
-        }
-        else
-            LOG(VB_GENERAL, LOG_INFO, "Added logging to mythlogserver locally");
-
-        loggingGetTimeStamp(&m_epoch, NULL);
-        
-        m_heartbeatTimer = new MythSignalingTimer(this, SLOT(checkHeartBeat()));
-        m_heartbeatTimer->start(1000);
-    }
-#else
-    logServerWait();
-#endif
+                LOG(VB_GENERAL, LOG_INFO, "Added logging to mythlogserver locally");
+
+            loggingGetTimeStamp(&m_epoch, NULL);
+            
+            m_heartbeatTimer = new MythSignalingTimer(this, SLOT(checkHeartBeat()));
+            m_heartbeatTimer->start(1000);
+        }
+    #else
+        logServerWait();
+    #endif
+    }
 
     QMutexLocker qLock(&logQueueMutex);
@@ -597 +604 @@
             free(threadName);
         }
+    }
+
+    if (m_noserver)
+    {
+        return;
     }
 
@@ -853 +865 @@
     }
 #endif
+
+    if (logPropagateOpts.noserver)
+    {
+        logPropagateArgs += " --nologserver";
+        logPropagateArgList << "--nologserver";
+    }
 }
 
@@ -860 +878 @@
 {
     return logPropagateOpts.quiet;
+}
+
+/// \brief Check if we are propagating a "--nologserver"
+/// \return true if --nologserver is being propagated
+bool logPropagateNoServer(void)
+{
+    return logPropagateOpts.noserver;
 }
 
@@ -875 +900 @@
 ///                     processes.
 void logStart(QString logfile, int progress, int quiet, int facility,
-              LogLevel_t level, bool dblog, bool propagate)
+              LogLevel_t level, bool dblog, bool propagate, bool noserver)
 {
     if (logThread && logThread->isRunning())
@@ -888 +913 @@
     logPropagateOpts.facility = facility;
     logPropagateOpts.dblog = dblog;
+    logPropagateOpts.noserver = noserver;
 
     if (propagate)
@@ -901 +927 @@
 
     if (!logThread)
-        logThread = new LoggerThread(logfile, progress, quiet, table, facility);
+        logThread = new LoggerThread(logfile, progress, quiet, table, facility, noserver);
 
     logThread->start();

mythtv/libs/libmythbase/logging.h

@@ -173 +173 @@
   public:
     LoggerThread(QString filename, bool progress, bool quiet, QString table,
-                 int facility);
+                 int facility, bool noserver);
     ~LoggerThread();
     void run(void);
@@ -209 +209 @@
     MythSignalingTimer *m_heartbeatTimer;   ///< Timer for 1s heartbeats
 
+    bool m_noserver;
+
   protected:
     bool logConsole(LoggingItem *item);

mythtv/libs/libmythbase/mythcommandlineparser.cpp

@@ -2376 +2376 @@
 
 /** \brief Canned argument definition for all logging options, including
- *  --verbose, --logpath, --quiet, --loglevel, --syslog
- *  and --enable-dblog
+ *  --verbose, --logpath, --quiet, --loglevel, --syslog, --enable-dblog
+ *  and --nologserver
  */
 void MythCommandLineParser::addLogging(
@@ -2433 +2433 @@
             "existing system logging daemon, or --logpath to specify a "
             "dirctory for MythTV to write its logs to.", "0.25");
+    add("--nologserver", "nologserver", false, "Disable all logging but console.", "")
+                ->SetGroup("Logging");
 }
 
@@ -2582 +2584 @@
     int facility = GetSyslogFacility();
     bool dblog = toBool("enabledblog");
+    bool noserver = toBool("nologserver");
     LogLevel_t level = GetLogLevel();
     if (level == LOG_UNKNOWN)
@@ -2601 +2604 @@
         quiet = max(quiet, 1);
 
-    logStart(logfile, progress, quiet, facility, level, dblog, propagate);
+    logStart(logfile, progress, quiet, facility, level, dblog, propagate, noserver);
 
     return GENERIC_EXIT_OK;

mythtv/libs/libmythbase/mythlogging.h

@@ -68 +68 @@
 MBASE_PUBLIC void logStart(QString logfile, int progress = 0, int quiet = 0,
                            int facility = 0, LogLevel_t level = LOG_INFO,
-                           bool dblog = true, bool propagate = false);
+                           bool dblog = true, bool propagate = false,
+                           bool noserver = false);
 MBASE_PUBLIC void logStop(void);
 MBASE_PUBLIC void logPropagateCalc(void);
 MBASE_PUBLIC bool logPropagateQuiet(void);
+MBASE_PUBLIC bool logPropagateNoServer(void);
 
 MBASE_PUBLIC int  syslogGetFacility(QString facility);

mythtv/libs/libmythbase/mythsystemlegacy.cpp

@@ -145 +145 @@
             if (logPropagateQuiet())
                 m_command += " --quiet";
+            if (logPropagateNoServer())
+                m_command += " --nologserver";
         }
         else
@@ -151 +153 @@
             if (logPropagateQuiet())
                 m_args << "--quiet";
+            if (logPropagateNoServer())
+                m_args << "--nologserver";
         }
     }