Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed heartbeat. Tested

  • Loading branch information...
commit 0dfdee4c68d3af9c31787db063811baa5e1d0560 1 parent cb4f433
@Beirdo Beirdo authored
View
2  mythtv/libs/libmythbase/logging.cpp
@@ -312,6 +312,8 @@ void LoggerThread::run(void)
while (!m_aborted || !logQueue.isEmpty())
{
+ qApp->processEvents();
+
if (logQueue.isEmpty())
{
m_waitEmpty->wakeAll();
View
4 mythtv/libs/libmythbase/loggingserver.cpp
@@ -147,6 +147,7 @@ FileLogger::~FileLogger()
m_zmqSock->setLinger(0);
m_zmqSock->disconnect(this);
m_zmqSock->close();
+ delete m_zmqSock;
}
/// \brief Reopen the logfile after a SIGHUP. Log files only (no console).
@@ -250,6 +251,7 @@ SyslogLogger::~SyslogLogger()
m_zmqSock->setLinger(0);
m_zmqSock->disconnect(this);
m_zmqSock->close();
+ delete m_zmqSock;
}
@@ -326,6 +328,7 @@ DatabaseLogger::~DatabaseLogger()
m_zmqSock->setLinger(0);
m_zmqSock->disconnect(this);
m_zmqSock->close();
+ delete m_zmqSock;
}
/// \brief Stop logging to the database and wait for the thread to stop.
@@ -730,6 +733,7 @@ void LogServerThread::checkHeartBeats(void)
while (!toDel.isEmpty())
{
QString clientId = toDel.takeFirst();
+ LOG(VB_GENERAL, LOG_INFO, QString("Expiring client %1").arg(clientId));
LoggerListItem *item = logClientMap.take(clientId);
LoggerList *list = item->list;
delete item;
Please sign in to comment.
Something went wrong with that request. Please try again.