Merge branch 'develop' into 1706-lock

This commit is contained in:
Michael Vogel 2017-06-06 14:16:00 +02:00 committed by GitHub
commit f4652d6e50
31 changed files with 19040 additions and 7890 deletions

View file

@ -32,7 +32,8 @@ function queue_run(&$argv, &$argc){
$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
if ($r) {
if (dbm::is_result($r)) {
foreach ($r as $rr) {
logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);