Logging fixes

diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php
index 8b2a458454711187e059d7dc7c39fea4dbf8763d..967454bad52b22dccf2944dad06d22167b9132ce 100644 (file)
--- a/lib/activityhandlerplugin.php
+++ b/lib/activityhandlerplugin.php
@@ -585,7 +585,8 @@ abstract class ActivityHandlerPlugin extends Plugin
         try {
             $this->showNoticeListItem($nli);
         } catch (Exception $e) {
-            $nli->out->element('p', 'error', 'Error showing notice: '.htmlspecialchars($e->getMessage()));
+            common_log(LOG_ERR, 'Error showing notice: ' . $e->getMessage());
+            $nli->out->element('p', 'error', sprintf(_('Error showing notice: %s'), $e->getMessage()));
         }
 
         Event::handle('EndShowNoticeItem', array($nli));

diff --git a/plugins/OStatus/lib/huboutqueuehandler.php b/plugins/OStatus/lib/huboutqueuehandler.php
index 67a9d9e36b8aee0d167d79efe5c8e9864c219fb8..9cab847cc29646b3f8a2469d44dd7d17fc01728f 100644 (file)
--- a/plugins/OStatus/lib/huboutqueuehandler.php
+++ b/plugins/OStatus/lib/huboutqueuehandler.php
@@ -49,7 +49,7 @@ class HubOutQueueHandler extends QueueHandler
             $msg = "Failed PuSH to $sub->callback for $sub->topic: " .
                    $e->getMessage();
             if ($retries > 0) {
-                common_log(LOG_ERR, "$msg; scheduling for $retries more tries");
+                common_log(LOG_INFO, "$msg; scheduling for $retries more tries");
 
                 // @fixme when we have infrastructure to schedule a retry
                 // after a delay, use it.