more queue updates from streams and remove a hz_syslog

1 files changed, 12 insertions, 11 deletions

diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php
index 23691408a..c48b59c86 100644
--- a/Zotlabs/Lib/Queue.php
+++ b/Zotlabs/Lib/Queue.php
@@ -166,17 +166,18 @@ class Queue {
 			$y = q("select site_update, site_dead from site where site_url = '%s' ",
 				dbesc($base)
 			);
-			if($y) {
-				if(intval($y[0]['site_dead'])) {
-					self::remove_by_posturl($outq['outq_posturl']);
-					logger('dead site ignored ' . $base);
-					return;
-				}
-				if($y[0]['site_update'] < datetime_convert('UTC','UTC','now - 1 month')) {
-					self::update($outq['outq_hash'], 10);
-					logger('immediate delivery deferred for site ' . $base);
-					return;
-				}
+
+			// Don't bother delivering if the site is dead.
+			// And if we haven't heard from the site in over a month - let them through but 3 strikes you're out.
+			if ($y && (intval($y[0]['site_dead']) || ($y[0]['site_update'] < datetime_convert('UTC', 'UTC', 'now - 1 month') && $outq['outq_priority'] > 20 ))) {
+				q("update dreport set dreport_result = '%s' where dreport_queue = '%s'",
+					dbesc('site dead'),
+					dbesc($outq['outq_hash'])
+				);
+
+				self::remove_by_posturl($outq['outq_posturl']);
+				logger('dead site ignored ' . $base);
+				return;
 			}
 			else {