move debug logging from PUT view to model.

weave/models.py

@@ -7,7 +7,7 @@
 Created on 15.03.2010
 
 @license: GNU GPL v3 or above, see LICENSE for more details.
-@copyright: 2010 see AUTHORS for more details.
+@copyright: 2010-2013 see AUTHORS for more details.
 @author: Jens Diemer
 @author: FladischerMichael
 '''
@@ -20,6 +20,9 @@
 from django.contrib.sites.managers import CurrentSiteManager
 
 from weave.utils import weave_timestamp
+from weave import Logging
+
+logger = Logging.get_logger()
 
 
 class BaseModel(models.Model):
@@ -31,17 +34,24 @@ class Meta:
 
 class CollectionManager(CurrentSiteManager):
     def create_or_update(self, user, col_name, timestamp, since=None):
+        logger.debug("Created or update collection %s for user %s" % (col_name, user.username))
+
         collection, created = super(CollectionManager, self).get_or_create(
             user=user, name=col_name,
         )
 
-        # See if we have a constraint on the last modified date  
+        # See if we have a constraint on the last modified date
         if since is not None:
             if since < collection.modified:
                 raise ValidationError
 
         collection.modified = timestamp
         collection.save()
+
+        if created:
+            logger.debug("New collection %s created." % collection)
+        else:
+            logger.debug("Existing collection %s updated." % collection)
         return collection, created
 
 
@@ -73,6 +83,8 @@ def create_or_update(self, payload_dict, collection, user, timestamp):
             - Check parentid, but how?
             - must wboid + parentid be unique?
         """
+        logger.debug("Created or update WBO for collection %s" % collection)
+
         payload = payload_dict['payload']
         payload_size = len(payload)
 
@@ -90,7 +102,9 @@ def create_or_update(self, payload_dict, collection, user, timestamp):
                 'payload': payload,
             }
         )
-        if not created:
+        if created:
+            logger.debug("New wbo created: %r" % wbo)
+        else:
             wbo.parentid = payload_dict.get("parentid", None)
             wbo.predecessorid = payload_dict.get("predecessorid", None)
             wbo.sortindex = payload_dict.get("sortindex", None)
@@ -99,6 +113,7 @@ def create_or_update(self, payload_dict, collection, user, timestamp):
             wbo.payload_size = payload_size
             wbo.payload = payload
             wbo.save()
+            logger.debug("Existing wbo updated: %r" % wbo)
 
         return wbo, created
 

weave/views/sync.py

@@ -6,7 +6,7 @@
     Created on 15.03.2010
     
     @license: GNU GPL v3 or above, see LICENSE for more details.
-    @copyleft: 2010-2011 by the django-sync-server team, see AUTHORS for more details.
+    @copyleft: 2010-2013 by the django-sync-server team, see AUTHORS for more details.
 '''
 
 from datetime import datetime
@@ -103,18 +103,8 @@ def storage(request, version, username, timestamp, col_name=None, wboid=None):
                                                                   since,
                                                                   )
 
-        if created:
-            logger.debug("Created new collection %s" % collection)
-        else:
-            logger.debug("Found existing collection %s" % collection)
-
         wbo, created = Wbo.objects.create_or_update(val, collection, request.user, timestamp)
 
-        if created:
-            logger.debug("New wbo created: %r" % wbo)
-        else:
-            logger.debug("Existing wbo updated: %r" % wbo)
-
         return weave_timestamp(timestamp)
 
     elif request.method == 'POST':