continue;
}
- $maxsysload = intval(get_config('system','maxloadavg'));
- if($maxsysload < 1)
- $maxsysload = 50;
-
- $load = current_load();
- if($load) {
- if(intval($load) > $maxsysload) {
- logger('system: load ' . $load . ' too high. Delivery deferred to next queue run.');
- return;
- }
- }
+ if (App::maxload_reached())
+ return;
// It's ours to deliver. Remove it from the queue.
if ($mail) {
$item['body'] = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
- $atom = dfrn_mail($item, $owner);
+ $atom = dfrn::mail($item, $owner);
} elseif ($fsuggest) {
- $atom = dfrn_fsuggest($item, $owner);
+ $atom = dfrn::fsuggest($item, $owner);
q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
} elseif ($relocate)
- $atom = dfrn_relocate($owner, $uid);
+ $atom = dfrn::relocate($owner, $uid);
elseif($followup) {
$msgitems = array();
foreach($items as $item) { // there is only one item
$msgitems[] = $item;
}
}
- $atom = dfrn_entries($msgitems,$owner);
+ $atom = dfrn::entries($msgitems,$owner);
} else {
$msgitems = array();
foreach($items as $item) {
$msgitems[] = $item;
}
}
- $atom = dfrn_entries($msgitems,$owner);
+ $atom = dfrn::entries($msgitems,$owner);
}
logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG);
break;
logger('mod-delivery: local delivery');
- local_delivery($x[0],$atom);
+ dfrn::import($atom, $x[0]);
break;
}
}
if(! was_recently_delayed($contact['id']))
- $deliver_status = dfrn_deliver($owner,$contact,$atom);
+ $deliver_status = dfrn::deliver($owner,$contact,$atom);
else
$deliver_status = (-1);