Merge lp:~jameinel/u1db/commandline into lp:u1db

[John A Meinel]

This adds 'u1db-serve' as a way to start a U1DB TCPSyncServer instance.

There is some basic tests for it. I may need to tweak the code a bit, because I'm not sure if all of terminate/kill/etc exist on all platforms.

For now, I don't have a default port, but it will use a randomly generated one and tell you where it bound to.

[Stuart Langridge (sil)]

Needs int(args.port), I think.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10/31/2011 10:53 PM, Stuart Langridge wrote:
> Needs int(args.port), I think.

I think I need "type=int" in the parser perhaps. But that is also what
test suites are for finding out :).

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk6vJKAACgkQJdeBCYSNAAMKOwCgz4XGywIMgCOshzjH1yGDDDuj
c6MAoMkFstd/RTXYrJFdtPVa1KgAI4CM
=6H+w
-----END PGP SIGNATURE-----

[Samuele Pedroni (pedronis)]

looks good but indeed -p port is not parsed as an int properly

review: Needs Fixing

[John A Meinel (jameinel)]

Updated to handle --port correctly, along with a test case.

[lp:~jameinel/u1db/commandline]

97. By John A Meinel on 2011-11-01

Update the code to properly handle --port

[Samuele Pedroni (pedronis)]

looks good, we need a way though to specify to listen not only on localhost (or the reverse)

review: Approve

[John A Meinel (jameinel)]

Bzr serve allows you to do it via the --port parameter. So you can say
--port localhost:4155

It doesn't seem like a great match, but also not something you set all the
time.

John
=:->
On Nov 2, 2011 7:16 AM, "Samuele Pedroni" <email address hidden>
wrote:

> Review: Approve
>
> looks good, we need a way though to specify to listen not only on
> localhost (or the reverse)
> --
> https://code.launchpad.net/~jameinel/u1db/commandline/+merge/80846
> You are the owner of lp:~jameinel/u1db/commandline.
>

[John A Meinel (jameinel)]

Oh, and I think the default should be 0.0.0.0, I was being conservative
with a prototype. Especially since it doesn't have innate auth yet.

John
=:->
On Nov 2, 2011 7:16 AM, "Samuele Pedroni" <email address hidden>
wrote:

> Review: Approve
>
> looks good, we need a way though to specify to listen not only on
> localhost (or the reverse)
> --
> https://code.launchpad.net/~jameinel/u1db/commandline/+merge/80846
> You are the owner of lp:~jameinel/u1db/commandline.
>

=== added file 'u1db-serve'
--- u1db-serve	1970-01-01 00:00:00 +0000
+++ u1db-serve	2011-11-01 14:02:24 +0000
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+from u1db import (
+    __version__ as _u1db_version,
+    )
+from u1db.remote import (
+    sync_server,
+    requests,
+    )
+
+
+def main(args):
+    import argparse
+    p = argparse.ArgumentParser(usage='%(prog)s [options]',
+        description='Run the U1DB server')
+    p.add_argument('--version', action='version', version=_u1db_version)
+    p.add_argument('--verbose', action='store_true', help='be chatty')
+    p.add_argument('--port', '-p', default=0, metavar='PORT', type=int,
+        help='Bind to this port when serving.')
+
+    args = p.parse_args(args)
+
+    state = requests.ServerState()
+    state.set_workingdir('.')
+    server = sync_server.TCPSyncServer(('127.0.0.1', args.port),
+        sync_server.TCPSyncRequestHandler, state)
+    sys.stdout.write('listening on port: %s\n' % (server.server_address[1],))
+    sys.stdout.flush()
+    server.serve_forever()
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv[1:]))
+
+
+# vim: ft=python

=== added directory 'u1db/tests/commandline'
=== added file 'u1db/tests/commandline/__init__.py'
--- u1db/tests/commandline/__init__.py	1970-01-01 00:00:00 +0000
+++ u1db/tests/commandline/__init__.py	2011-11-01 14:02:24 +0000
@@ -0,0 +1,15 @@
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+

=== added file 'u1db/tests/commandline/test_serve.py'
--- u1db/tests/commandline/test_serve.py	1970-01-01 00:00:00 +0000
+++ u1db/tests/commandline/test_serve.py	2011-11-01 14:02:24 +0000
@@ -0,0 +1,106 @@
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import errno
+import os
+import socket
+import subprocess
+import sys
+import time
+
+from u1db import (
+    __version__ as _u1db_version,
+    tests,
+    )
+from u1db.remote import client
+
+
+def safe_close(process, timeout=0.1):
+    """Shutdown the process in the nicest fashion you can manage.
+
+    :param process: A subprocess.Popen object.
+    :param timeout: We'll try to send 'SIGTERM' but if the process is alive
+        longer that 'timeout', we'll send SIGKILL.
+    """
+    if process.poll() is not None:
+        return
+    try:
+        process.terminate()
+    except OSError, e:
+        if e.errno in (errno.ESRCH,):
+            # Process has exited
+            return
+    tend = time.time() + timeout
+    while time.time() < tend:
+        if process.poll() is not None:
+            return
+        time.sleep(0.01)
+    try:
+        process.kill()
+    except OSError, e:
+        if e.errno in (errno.ESRCH,):
+            # Process has exited
+            return
+    process.wait()
+
+
+class TestU1DBServe(tests.TestCase):
+
+    def _get_u1db_serve_path(self):
+        from u1db import __path__ as u1db_path
+        u1db_parent_dir = os.path.dirname(u1db_path[0])
+        return os.path.join(u1db_parent_dir, 'u1db-serve')
+
+    def startU1DBServe(self, args):
+        command = [sys.executable, self._get_u1db_serve_path()]
+        command.extend(args)
+        p = subprocess.Popen(command, stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        self.addCleanup(safe_close, p)
+        return p
+
+    def test_help(self):
+        p = self.startU1DBServe(['--help'])
+        stdout, stderr = p.communicate()
+        self.assertEqual('', stderr)
+        self.assertEqual(0, p.returncode)
+        self.assertIn('Run the U1DB server', stdout)
+
+    def test_bind_to_port(self):
+        p = self.startU1DBServe([])
+        starts = 'listening on port:'
+        x = p.stdout.readline()
+        self.assertTrue(x.startswith(starts))
+        port = int(x[len(starts):])
+        s = socket.socket()
+        s.connect(('127.0.0.1', port))
+        self.addCleanup(s.close)
+        c = client.Client(s)
+        self.assertEqual({'version': _u1db_version},
+                         c.call_returning_args('version'))
+
+    def test_supply_port(self):
+        s = socket.socket()
+        s.bind(('127.0.0.1', 0))
+        host, port = s.getsockname()
+        s.close()
+        p = self.startU1DBServe(['--port', str(port)])
+        x = p.stdout.readline()
+        self.assertEqual('listening on port: %s\n' % (port,), x)
+        s = socket.socket()
+        s.connect(('127.0.0.1', port))
+        self.addCleanup(s.close)
+        c = client.Client(s)
+        self.assertEqual({'version': _u1db_version},
+                         c.call_returning_args('version'))