diff options
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/leap/soledad/server/sync.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/server/src/leap/soledad/server/sync.py b/server/src/leap/soledad/server/sync.py index e12ebf8a..533ce778 100644 --- a/server/src/leap/soledad/server/sync.py +++ b/server/src/leap/soledad/server/sync.py @@ -17,6 +17,7 @@ """ Server side synchronization infrastructure. """ +<<<<<<< a64e0fad3a8b1a07887c567d99fd32e3dcf54b23 import time from leap.soledad.common.l2db import sync from leap.soledad.common.l2db.remote import http_app @@ -24,6 +25,15 @@ from leap.soledad.server.caching import get_cache_for from leap.soledad.server.state import ServerSyncState from leap.soledad.common.document import ServerDocument from itertools import izip +======= +from itertools import izip +import cjson + +from leap.soledad.common.l2db import sync, Document +from leap.soledad.common.l2db.remote import http_app +from leap.soledad.server.caching import get_cache_for +from leap.soledad.server.state import ServerSyncState +>>>>>>> wip: adapt crypto to streaming flow MAX_REQUEST_SIZE = 6000 # in Mb @@ -199,6 +209,7 @@ class SyncResource(http_app.SyncResource): not already exist. :type ensure: bool """ + print "POST ARGS" # create or open the database cache = get_cache_for('db-' + sync_id + self.dbname, expire=120) if ensure: @@ -271,6 +282,7 @@ class SyncResource(http_app.SyncResource): client on the current sync session. :type received: int """ + print 'IN POST GET' def send_doc(doc, gen, trans_id): entry = dict(id=doc.doc_id, rev=doc.rev, |