Ticket #2194: housekeeper.2.diff

mythtv/programs/mythbackend/housekeeper.cpp

@@ -50 +50 @@
     unsigned int longEnough = 0;
 
     if (period)
-        longEnough = ((period * oneday) - 600);
+        longEnough = ((period * oneday) - oneday/2);
     else
         longEnough = oneday / 8;
 
@@ -58 +58 @@
     QDateTime lastrun;
     lastrun.setTime_t(0);
 
+    if (minhour < 0)
+        minhour = 0;
+    if (maxhour > 23)
+        maxhour = 23;
+    if (minhour > maxhour)
+    {
+        VERBOSE(VB_GENERAL,
+            "Housekeeping thread will not run: supplied time range is empty");
+    }
+
     MSqlQuery result(MSqlQuery::InitCon());
     if (result.isConnected())
     {
@@ -69 +79 @@
             result.next();
             lastrun = result.value(0).toDateTime();
 
-            if ((now.toTime_t() - lastrun.toTime_t()) > longEnough)
+            if ((now.toTime_t() - lastrun.toTime_t()) > longEnough &&
+                (now.toString(QString("d")).toInt() !=
+                     lastrun.toString(QString("d")).toInt()))
             {
                 int hour = now.toString(QString("h")).toInt();
                 if ((hour >= minhour) && (hour <= maxhour))
-                    runOK = true;
+                {
+                    int minute = now.toString(QString("m")).toInt();
+                    if ((hour == maxhour && minute > 30) ||
+                        ((random()%((maxhour-hour)*12+(60-minute)/5 - 6) == 0)))
+                        runOK = true;
+                }
             }
         }
         else
@@ -239 +256 @@
             updateLastrun(dbTag);
         }
 
-        sleep(300);
+        sleep(300 + (random()%8));
     }
 }