You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/01/16 18:00:06 UTC
svn commit: r1434036 - in /subversion/trunk/tools/server-side/svnpubsub:
svnpubsub/server.py testserver.py
Author: danielsh
Date: Wed Jan 16 17:00:06 2013
New Revision: 1434036
URL: http://svn.apache.org/viewvc?rev=1434036&view=rev
Log:
[in tools/server-side/svnpubsub]
Add linebreaks between records (in addition to NULs) for human readability.
* svnpubsub/server.py
(Client.write_data, Client.write_start, Client.write_heartbeat):
s/\0/\n\0/
* testserver.py
(TEST_BODY): Ditto.
Modified:
subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py
subversion/trunk/tools/server-side/svnpubsub/testserver.py
Modified: subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py?rev=1434036&r1=1434035&r2=1434036&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py Wed Jan 16 17:00:06 2013
@@ -145,7 +145,7 @@ class Client(object):
reactor.callLater(HEARTBEAT_TIME, self.heartbeat, None)
def write_data(self, data):
- self.write(data + "\0")
+ self.write(data + "\n\0")
""" "Data must not be unicode" is what the interfaces.ITransport says... grr. """
def write(self, input):
@@ -153,10 +153,10 @@ class Client(object):
def write_start(self):
self.r.setHeader('content-type', 'application/json')
- self.write('{"svnpubsub": {"version": 1}}\0')
+ self.write('{"svnpubsub": {"version": 1}}\n\0')
def write_heartbeat(self):
- self.write(json.dumps({"stillalive": time.time()}) + "\0")
+ self.write(json.dumps({"stillalive": time.time()}) + "\n\0")
class SvnPubSub(resource.Resource):
Modified: subversion/trunk/tools/server-side/svnpubsub/testserver.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/testserver.py?rev=1434036&r1=1434035&r2=1434036&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/testserver.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/testserver.py Wed Jan 16 17:00:06 2013
@@ -30,7 +30,7 @@ import BaseHTTPServer
PORT = 2069
-TEST_BODY = '{"svnpubsub": {"version": 1}}\0{"commit": {"type": "svn", "format": 1, "repository": "12345678-1234-1234-1234-123456789012", "id": "1234", "committer": "johndoe", "date": "2012-01-01 01:01:01 +0000 (Sun, 01 Jan 2012)", "log": "Frob the ganoozle with the snookish", "changed": {"one/path/alpha": {"flags": "U "}, "some/other/directory/": {"flags": "_U "}}}}\0'
+TEST_BODY = '{"svnpubsub": {"version": 1}}\n\0{"commit": {"type": "svn", "format": 1, "repository": "12345678-1234-1234-1234-123456789012", "id": "1234", "committer": "johndoe", "date": "2012-01-01 01:01:01 +0000 (Sun, 01 Jan 2012)", "log": "Frob the ganoozle with the snookish", "changed": {"one/path/alpha": {"flags": "U "}, "some/other/directory/": {"flags": "_U "}}}}\n\0'
SEND_KEEPALIVE = True