GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

Browse Source
This commit is contained in:
Mikael Nordfeldth 2017-09-10 14:06:03 +02:00
commit ec504ec4df
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extlib/Stomp.php
View File

@ -324,7 +324,9 @@ class Stomp
{ {
$headers = array('ack' => 'client'); $headers = array('ack' => 'client');
$headers['activemq.prefetchSize'] = $this->prefetchSize; $headers['activemq.prefetchSize'] = $this->prefetchSize;
if ($this->clientId != null) { $headers['prefetch-count'] = '1';
if ($this->clientId != null) {
$headers["activemq.subcriptionName"] = $this->clientId; $headers["activemq.subcriptionName"] = $this->clientId;
} }
if (isset($properties)) { if (isset($properties)) {

6
lib/stompqueuemanager.php
View File

@ -151,7 +151,7 @@ class StompQueueManager extends QueueManager
$envelope = array('site' => $siteNickname ? $siteNickname : common_config('site', 'nickname'), $envelope = array('site' => $siteNickname ? $siteNickname : common_config('site', 'nickname'),
'handler' => $queue, 'handler' => $queue,
'payload' => $this->encode($object)); 'payload' => $this->encode($object));
$msg = serialize($envelope); $msg = base64_encode(serialize($envelope));
$props = array('created' => common_sql_now()); $props = array('created' => common_sql_now());
if ($this->isPersistent($queue)) { if ($this->isPersistent($queue)) {
@ -479,7 +479,7 @@ class StompQueueManager extends QueueManager
protected function handleItem($frame) protected function handleItem($frame)
{ {
$host = $this->cons[$this->defaultIdx]->getServer(); $host = $this->cons[$this->defaultIdx]->getServer();
$message = unserialize($frame->body); $message = unserialize(base64_decode($frame->body));
if ($message === false) { if ($message === false) {
$this->_log(LOG_ERR, "Can't unserialize frame: {$frame->body}"); $this->_log(LOG_ERR, "Can't unserialize frame: {$frame->body}");
@ -490,7 +490,7 @@ class StompQueueManager extends QueueManager
$site = $message['site']; $site = $message['site'];
$queue = $message['handler']; $queue = $message['handler'];
if ($this->isDeadletter($frame, $message)) { if ($this->isDeadLetter($frame, $message)) {
$this->stats('deadletter', $queue); $this->stats('deadletter', $queue);
return false; return false;
} }