Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 18 insertions, 3 deletions

diff --git a/include/queue.php b/include/queue.php
index b6a540ef9..7d2ad3b2d 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -39,12 +39,25 @@ function queue_run($argv, $argc){
 		// so that we don't start off a thousand deliveries for a couple of dead hubs.
 		// The zot driver will deliver everything destined for a single hub once contact is made (*if* contact is made).
 		// Other drivers will have to do something different here and may need their own query.
+
+		// Note: this requires some tweaking as new posts to long dead hubs once a day will keep them in the 
+		// "every 15 minutes" category. We probably need to prioritise them when inserted into the queue
+		// or just prior to this query based on recent and long-term delivery history. If we have good reason to believe
+		// the site is permanently down, there's no reason to attempt delivery at all, or at most not more than once 
+		// or twice a day. 
+
+		// FIXME: can we sort postgres on outq_priority and maintain the 'distinct' ?
+		// The order by max(outq_priority) might be a dodgy query because of the group by.
+		// The desired result is to return a sequence in the order most likely to be delivered in this run.
+		// If a hub has already been sitting in the queue for a few days, they should be delivered last;
+		// hence every failure should drop them further down the priority list.
+ 
 		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
 			$prefix = 'DISTINCT ON (outq_posturl)';
 			$suffix = 'ORDER BY outq_posturl';
 		} else {
 			$prefix = '';
-			$suffix = 'GROUP BY outq_posturl';
+			$suffix = 'GROUP BY outq_posturl ORDER BY max(outq_priority)';
 		}
 		$r = q("SELECT $prefix * FROM outq WHERE outq_delivered = 0 and (( outq_created > %s - INTERVAL %s and outq_updated < %s - INTERVAL %s ) OR ( outq_updated < %s - INTERVAL %s )) $suffix",
 			db_utcnow(), db_quoteinterval('12 HOUR'),
@@ -69,7 +82,7 @@ function queue_run($argv, $argc){
 			}
 			else {
 				logger('queue: queue post returned ' . $result['return_code'] . ' from ' . $rr['outq_posturl'],LOGGER_DEBUG);
-				$y = q("update outq set outq_updated = '%s' where outq_hash = '%s'",
+				$y = q("update outq set outq_updated = '%s', outq_priority = outq_priority + 10 where outq_hash = '%s'",
 					dbesc(datetime_convert()),
 					dbesc($rr['outq_hash'])
 				);
@@ -78,11 +91,13 @@ function queue_run($argv, $argc){
 		}
 		$result = zot_zot($rr['outq_posturl'],$rr['outq_notify']); 
 		if($result['success']) {
+			logger('queue: deliver zot success to ' . $rr['outq_posturl'], LOGGER_DEBUG);			
 			zot_process_response($rr['outq_posturl'],$result, $rr);				
 		}
 		else {
 			$deadguys[] = $rr['outq_posturl'];
-			$y = q("update outq set outq_updated = '%s' where outq_hash = '%s'",
+			logger('queue: deliver zot returned ' . $result['return_code'] . ' from ' . $rr['outq_posturl'],LOGGER_DEBUG);
+			$y = q("update outq set outq_updated = '%s', outq_priority = outq_priority + 10 where outq_hash = '%s'",
 				dbesc(datetime_convert()),
 				dbesc($rr['outq_hash'])
 			);