- $posts = ProtocolDelivery::selectQueueForServer($gsid);
- foreach ($posts as $post) {
- if (!$server_failure && ProtocolDelivery::deliver($post['command'], $post['uri-id'], $post['cid'], $post['uid'])) {
- ProtocolDelivery::removeQueue($post['uri-id'], $post['gsid']);
- Logger::debug('Delivery successful', $post);
+ $deliveryQueueItems = DI::deliveryQueueItemRepo()->selectByServerId($gsid, DI::config()->get('system', 'worker_defer_limit'));
+ foreach ($deliveryQueueItems as $deliveryQueueItem) {
+ if (!$server_failure && ProtocolDelivery::deliver($deliveryQueueItem->command, $deliveryQueueItem->postUriId, $deliveryQueueItem->targetContactId, $deliveryQueueItem->senderUserId)) {
+ DI::deliveryQueueItemRepo()->remove($deliveryQueueItem);
+ Logger::debug('Delivery successful', $deliveryQueueItem->toArray());