diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-15 17:28:45 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-15 17:28:45 -0800 |
| commit | 1029939f5622d03e3efad297476be14a2313169c (patch) | |
| tree | 36970c92e52694127503c5745581c495199206c8 /include/deliver.php | |
| parent | dba38821bc5f3ad9b3a8f4f614d651e98f0b5ec5 (diff) | |
| download | volse-hubzilla-1029939f5622d03e3efad297476be14a2313169c.tar.gz volse-hubzilla-1029939f5622d03e3efad297476be14a2313169c.tar.bz2 volse-hubzilla-1029939f5622d03e3efad297476be14a2313169c.zip | |
issues connecting to local forum
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]) |