Merge branch 'master' of github.com:samuelclay/NewsBlur

apps/analyzer/views.py

@@ -76,6 +76,8 @@ def save_classifier(request):
     _save_classifier(ClassifierTitle, 'title')
     _save_classifier(ClassifierFeed, 'publisher')
     
+    print " ---> [%s]: Feed training: %s" % (request.user, feed)
+
     response = dict(code=code, message=message, payload=payload)
     return response
     

apps/reader/views.py

@@ -523,11 +523,11 @@ def load_features(request):
 @json.json_view
 def save_feed_order(request):
     folders = request.POST.get('folders')
-    print " ---> [%s]: Feed re-ordering: %s" % (request.user, folders)
     if folders:
         # Test that folders can be JSON decoded
         folders_list = json.decode(folders)
         assert folders_list is not None
+        print " ---> [%s]: Feed re-ordering: %s folders/feeds" % (request.user, len(folders_list))
         user_sub_folders = UserSubscriptionFolders.objects.get(user=request.user)
         user_sub_folders.folders = folders
         user_sub_folders.save()
@@ -551,6 +551,8 @@ def get_feeds_trainer(request):
             classifier['feed_authors'] = json.decode(us.feed.popular_authors) if us.feed.popular_authors else []
             classifiers.append(classifier)
     
+    print " ---> [%s] Loading Trainer: %s" % (request.user, len(classifiers))
+    
     return classifiers
     
 @login_required

apps/rss_feeds/views.py

@@ -25,4 +25,6 @@ def load_feed_statistics(request):
     # Subscribers
     stats['subscriber_count'] = feed.num_subscribers
     
+    print " ---> [%s] Statistics: %s" % (request.user, feed)
+    
     return stats

utils/json.py

@@ -108,7 +108,7 @@ def json_view(func):
                 '\n'.join(traceback.format_exception(*exc_info)),
                 request_repr,
                 )
-            print message
+            # print message
             mail_admins(subject, message, fail_silently=True)
 
             # Come what may, we're returning JSON.
@@ -126,7 +126,7 @@ def json_view(func):
 def main():
     test = {1: True, 2: u"string", 3: 30}
     json_test = json_encode(test)
-    print test, json_test
+    # print test, json_test
     
 if __name__ == '__main__':
     main()