git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit d9fbc17f authored by mmn's avatar mmn

Merge branch 'nightly' into 'nightly'

Added base64 encoding to get RMQ to work

See merge request !151
parents d61375cb 90e93b96
......@@ -324,7 +324,9 @@ class Stomp
{
$headers = array('ack' => 'client');
$headers['activemq.prefetchSize'] = $this->prefetchSize;
if ($this->clientId != null) {
$headers['prefetch-count'] = '1';
if ($this->clientId != null) {
$headers["activemq.subcriptionName"] = $this->clientId;
}
if (isset($properties)) {
......
......@@ -151,7 +151,7 @@ class StompQueueManager extends QueueManager
$envelope = array('site' => $siteNickname ? $siteNickname : common_config('site', 'nickname'),
'handler' => $queue,
'payload' => $this->encode($object));
$msg = serialize($envelope);
$msg = base64_encode(serialize($envelope));
$props = array('created' => common_sql_now());
if ($this->isPersistent($queue)) {
......@@ -479,7 +479,7 @@ class StompQueueManager extends QueueManager
protected function handleItem($frame)
{
$host = $this->cons[$this->defaultIdx]->getServer();
$message = unserialize($frame->body);
$message = unserialize(base64_decode($frame->body));
if ($message === false) {
$this->_log(LOG_ERR, "Can't unserialize frame: {$frame->body}");
......@@ -490,7 +490,7 @@ class StompQueueManager extends QueueManager
$site = $message['site'];
$queue = $message['handler'];
if ($this->isDeadletter($frame, $message)) {
if ($this->isDeadLetter($frame, $message)) {
$this->stats('deadletter', $queue);
return false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment