diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-16 06:42:08 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-16 06:42:08 +0100 |
| commit | 69487389d362285aeeb5106097864ec982c08a59 (patch) | |
| tree | f5eede7c0a6a5ade0b097b6646f8de2cb33ba5e5 /include/deliver.php | |
| parent | fd5d1416d9a65206879588ff195a8e1d3b49c008 (diff) | |
| parent | 0cb5f009b483ff570ded4570bb45023573531494 (diff) | |
| download | volse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.tar.gz volse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.tar.bz2 volse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/deliver.php')
| -rw-r--r-- | include/deliver.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/deliver.php b/include/deliver.php index 11c1b249e..de93e316e 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -107,15 +107,10 @@ function deliver_run($argv, $argc) { $notify = json_decode($r[0]['outq_notify'],true); - // Check if this is a conversation request packet. It won't have outq_msg - // but will be an encrypted packet - so will need to be handed off to - // web delivery rather than processed inline. + // Messages without an outq_msg will need to go via the web, even if it's a + // local delivery. This includes conversation requests and refresh packets. - $sendtoweb = false; - if(array_key_exists('iv',$notify) && (! $r[0]['outq_msg'])) - $sendtoweb = true; - - if(($r[0]['outq_posturl'] === z_root() . '/post') && (! $sendtoweb)) { + if(($r[0]['outq_posturl'] === z_root() . '/post') && ($r[0]['outq_msg'])) { logger('deliver: local delivery', LOGGER_DEBUG); // local delivery // we should probably batch these and save a few delivery processes @@ -166,6 +161,7 @@ function deliver_run($argv, $argc) { } else { logger('deliver: remote zot delivery failed to ' . $r[0]['outq_posturl']); + logger('deliver: remote zot delivery fail data: ' . print_r($result,true), LOGGER_DATA); $y = q("update outq set outq_updated = '%s' where outq_hash = '%s'", dbesc(datetime_convert()), dbesc($argv[$x]) |