From c95114ea02757cf114ae34f33c9a7cacee49a8da Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 6 Jan 2010 07:44:34 +0000
Subject: [PATCH] Some better log msgs

---
 plugins/RSSCloud/README                    |  5 +++--
 plugins/RSSCloud/RSSCloudRequestNotify.php | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/plugins/RSSCloud/README b/plugins/RSSCloud/README
index 8fd281aab6..1237e3e0e2 100644
--- a/plugins/RSSCloud/README
+++ b/plugins/RSSCloud/README
@@ -4,7 +4,8 @@ http://SITE/PATH/api/statuses/user_timeline/USERNAME.rss). When the
 plugin is enabled, StatusNet acts as both the publisher and hub ('writer' and
 'cloud' in RSSCloud parlance), but only for local StatusNet feeds. It's
 not possible to use it as a general purpose hub -- for instance you can't
-subscribe and get updates to a Wordpress feed from StatusNet.
+subscribe and get updates to a Wordpress feed from StatusNet using this
+plugin.
 
 To use the plugin, add the following to your config.php:
 
@@ -33,7 +34,7 @@ Notes
 -----
 
 - Again, only RSS 2.0 profile feeds may be subscribed to, and they have
-  be the ones with user names in them, like:
+  to be the ones with user names in them, like:
       http://SITE/PATH/api/statuses/user_timeline/USERNAME.rss
 - Subscriptions are deleted after three notification failures in a row
   (not sure this is optimal).
diff --git a/plugins/RSSCloud/RSSCloudRequestNotify.php b/plugins/RSSCloud/RSSCloudRequestNotify.php
index a648efff17..d76c08d379 100644
--- a/plugins/RSSCloud/RSSCloudRequestNotify.php
+++ b/plugins/RSSCloud/RSSCloudRequestNotify.php
@@ -137,6 +137,11 @@ class RSSCloudRequestNotifyAction extends Action
         foreach ($this->feeds as $feed) {
 
             if (!$this->validateFeed($feed)) {
+
+                $nh = $this->getNotifyUrl();
+                common_log(LOG_WARNING,
+                           "RSSCloud plugin - $nh tried to subscribe to invalid feed: $feed");
+
                 $msg = 'Feed subscription failed - Not a valid feed.';
                 $this->showResult(false, $msg);
                 return;
@@ -216,8 +221,6 @@ class RSSCloudRequestNotifyAction extends Action
 
     function testNotificationHandler($feed)
     {
-        common_debug("RSSCloudPlugin - testNotificationHandler()");
-
         $notifyUrl = $this->getNotifyUrl();
 
         $notifier = new RSSCloudNotifier();
@@ -226,12 +229,13 @@ class RSSCloudRequestNotifyAction extends Action
 
             // 'domain' param set, so we have to use GET and send a challenge
 
-            common_log(LOG_INFO, 'Testing notification handler with challenge: ' .
+            common_log(LOG_INFO,
+                       'RSSCloud plugin - Testing notification handler with challenge: ' .
                        $notifyUrl);
             return $notifier->challenge($notifyUrl, $feed);
 
         } else {
-            common_log(LOG_INFO, 'Testing notification handler: ' .
+            common_log(LOG_INFO, 'RSSCloud plugin - Testing notification handler: ' .
                        $notifyUrl);
 
             return $notifier->postUpdate($notifyUrl, $feed);
@@ -298,7 +302,8 @@ class RSSCloudRequestNotifyAction extends Action
         $sub = RSSCloudSubscription::getSubscription($user->id, $notifyUrl);
 
         if ($sub) {
-            common_debug("Already subscribed to that!");
+            common_log(LOG_INFO, "RSSCloud plugin - $notifyUrl refreshed subscription" .
+                         " to user $user->nickname (id: $user->id).");
         } else {
 
             $sub = new RSSCloudSubscription();
@@ -312,6 +317,8 @@ class RSSCloudRequestNotifyAction extends Action
                 return false;
             }
 
+            common_log(LOG_INFO, "RSSCloud plugin - $notifyUrl subscribed" .
+                       " to user $user->nickname (id: $user->id)");
         }
 
         return true;