Correct event handling for managing multiple housekeepers in same scope.

This makes the MythEvent process properly handle hostname and scope to make sure runtimes are only updated when received from another conflicting housekeeper and task.
MythTV · Jun 9, 2013 · e167dfb · e167dfb
1 parent a2d9e89
commit e167dfb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/mythtv/libs/libmythbase/housekeeper.cpp b/mythtv/libs/libmythbase/housekeeper.cpp
@@ -663,7 +663,15 @@ void HouseKeeper::customEvent(QEvent *e)
 
             QMutexLocker mapLock(&m_mapLock);
             if (m_taskMap.contains(tag))
-                m_taskMap[tag]->SetLastRun(last);
+            {
+                if ((m_taskMap[tag]->GetScope() == kHKGlobal) ||
+                        ((m_taskMap[tag]->GetScope() == kHKLocal) &&
+                         (gCoreContext->GetHostName() == hostname)))
+                    // task being run in the same scope as us.
+                    // update the run time so we don't attempt to run
+                    //      it ourselves
+                    m_taskMap[tag]->SetLastRun(last);
+            }
         }
     }
 }

diff --git a/mythtv/libs/libmythbase/housekeeper.h b/mythtv/libs/libmythbase/housekeeper.h
@@ -48,6 +48,7 @@ class MBASE_PUBLIC HouseKeeperTask : public ReferenceCounter
 
     QString         GetTag(void)                    { return m_dbTag;       }
     QDateTime       GetLastRun(void)                { return m_lastRun;     }
+    HouseKeeperScope    GetScope(void)              { return m_scope;       }
     QDateTime       QueryLastRun(void);
     QDateTime       UpdateLastRun(void)
                            { return UpdateLastRun(MythDate::current());     }

diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
@@ -12,7 +12,7 @@
 /// Update this whenever the plug-in ABI changes.
 /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
 /// libmythui class methods in exported headers.
-#define MYTH_BINARY_VERSION "0.27.20130608-1"
+#define MYTH_BINARY_VERSION "0.27.20130608-2"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *