Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / lib / stompqueuemanager.php

diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 45a82e240acab6f35756e4544d298ee77db86464..25a8e2a27ebaef546bfa6ea7017c83dd7583a709 100644 (file)
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -483,7 +483,7 @@ class StompQueueManager extends QueueManager
 
         if ($message === false) {
             $this->_log(LOG_ERR, "Can't unserialize frame: {$frame->body}");
-            $this->stats('baditem', $queue);
+            $this->_log(LOG_ERR, "Unserializable frame length: " . strlen($frame->body));
             return false;
         }
 
@@ -498,8 +498,9 @@ class StompQueueManager extends QueueManager
         // @fixme detect failing site switches
         $this->switchSite($site);
 
-        $item = $this->decode($message['payload']);
-        if (empty($item)) {
+        try {
+            $item = $this->decode($message['payload']);
+        } catch (Exception $e) {
             $this->_log(LOG_ERR, "Skipping empty or deleted item in queue $queue from $host");
             $this->stats('baditem', $queue);
             return false;
@@ -656,7 +657,7 @@ class StompQueueManager extends QueueManager
      */
     protected function updateSiteConfig($nickname)
     {
-        $sn = Status_network::staticGet('nickname', $nickname);
+        $sn = Status_network::getKV('nickname', $nickname);
         if ($sn) {
             $this->switchSite($nickname);
             if (!in_array($nickname, $this->sites)) {