Merge lp:~mandel/desktopcouch/reactor_already_installed into lp:desktopcouch

[Manuel de la Peña]

Fix lp:670562 by moving the reactor installation to the service start code.

Fix lp:670562 by moving the reactor installation to the service start code.

[Alejandro J. Cura (alecu)]

review: Approve

[lp:~mandel/desktopcouch/reactor_already_installed]

198. By Manuel de la Peña on 2010-11-03

Fix lint errors.

199. By Manuel de la Peña on 2010-11-03

Remove pairing, there was an error in a previous merge, this hsould not be here :(

200. By Manuel de la Peña on 2010-11-03

Fixed lint issues.

[Natalia Bidart (nataliabidart)]

I'm getting the error reported un bug #670600.

[Natalia Bidart (nataliabidart)]

Other than the test failure reported before, the reactor already register issue is solved.

review: Approve

=== modified file 'bin/desktopcouch-service'
--- bin/desktopcouch-service	2010-10-31 21:37:35 +0000
+++ bin/desktopcouch-service	2010-11-03 20:07:19 +0000
@@ -36,6 +36,10 @@
 
 from desktopcouch.platform import init_mainloop
 from desktopcouch.service import DesktopcouchService
+# TODO: This should not be here, what if we do not use 
+# twisted?
+from twisted.internet import glib2reactor
+glib2reactor.install()
 
 if __name__ == "__main__":
     # create the service object that will host the operations

=== modified file 'desktopcouch/platform/__init__.py'
--- desktopcouch/platform/__init__.py	2010-11-01 19:13:27 +0000
+++ desktopcouch/platform/__init__.py	2010-11-03 20:07:19 +0000
@@ -2,22 +2,27 @@
 import sys
 
 if sys.platform == "win32":
-    from desktopcouch.platform.windows import *
+    pass
 else:
     # install the correct reactor for linux
-    from twisted.internet import glib2reactor
-    glib2reactor.install()
-    from desktopcouch.platform.linux import *
-    from desktopcouch.platform.linux.ipc import *
-    from desktopcouch.platform.linux.keyring import *
+    from desktopcouch.platform.linux import (
+        process_is_couchdb, platform_read_pidfile,
+        platform_find_pid, platform_find_port,
+        set_application_name, init_mainloop,
+        direct_access_find_port)
+    from desktopcouch.platform.linux.ipc import PortAdvertiser
+    from desktopcouch.platform.linux.keyring import Keyring
 
 from desktopcouch.local_files import DEFAULT_CONTEXT
 
 def read_pidfile(ctx=DEFAULT_CONTEXT):
+    """Read the pid file of couchdb in the executing ctx."""
     return platform_read_pidfile(ctx)
 
 def find_pid(start_if_not_running=True, ctx=DEFAULT_CONTEXT):
+    """Find the process id of the currently executing couchdb."""
     return platform_find_pid(start_if_not_running, ctx)
 
 def find_port(pid=None, ctx=DEFAULT_CONTEXT):
+    """Find the port where couchdb is listening for the current ctx."""
     return platform_find_port(pid, ctx)

=== modified file 'desktopcouch/platform/linux/__init__.py'
--- desktopcouch/platform/linux/__init__.py	2010-11-01 19:13:27 +0000
+++ desktopcouch/platform/linux/__init__.py	2010-11-03 20:07:19 +0000
@@ -22,7 +22,6 @@
 import dbus
 import logging
 import platform
-import os
 
 
 def process_is_couchdb(pid):
@@ -53,17 +52,17 @@
         pid_file = ctx.file_pid
         if not os.path.exists(pid_file):
             return None
-        with open(pid_file) as fp:
+        with open(pid_file) as file_descriptor:
             try:
-                contents = fp.read()
+                contents = file_descriptor.read()
                 if contents == "\n":
                     return None  # not yet written to pid file
                 return int(contents)
             except ValueError:
                 logging.warn("Pid file does not contain int: %r", contents)
                 return None
-    except IOError, e:
-        logging.warn("Reading pid file caused error.  %s", e)
+    except IOError, exception:
+        logging.warn("Reading pid file caused error.  %s", exception)
         return None
 
 
@@ -81,7 +80,6 @@
             # now load the design documents and pair records updates,
             # because it's started
             start_local_couchdb.update_design_documents()
-            start_local_couchdb.update_pairing_service()
             if not process_is_couchdb(pid):
                 logging.error("CouchDB process did not start up")
                 raise RuntimeError("desktop-couch not started")
@@ -104,12 +102,12 @@
 ####  method-response.  Once that is worked out, resume using the
 ####  rest of this function instead of the direct access above.
     # Hrm, we don't use 'pid' or 'ctx' any more, since we go through DBus.
-    if ctx != local_files.DEFAULT_CONTEXT or pid is not None:
-        return direct_access_find_port(pid=pid, ctx=ctx)
-
-    bus = dbus.SessionBus()
-    proxy = bus.get_object('org.desktopcouch.CouchDB', '/')
-    return proxy.getPort()
+###    if ctx != local_files.DEFAULT_CONTEXT or pid is not None:
+###        return direct_access_find_port(pid=pid, ctx=ctx)
+###
+###    bus = dbus.SessionBus()
+###    proxy = bus.get_object('org.desktopcouch.CouchDB', '/')
+###    return proxy.getPort()
 ####
 ####  ^^
 
@@ -142,16 +140,18 @@
     except OSError:
         if retries_left:
             return direct_access_find_port(pid, ctx, retries_left - 1)
-        logging.exception("Unable to find file descriptors in %s" % proc_dir)
+        logging.exception("Unable to find file descriptors in %s", 
+            proc_dir)
         raise RuntimeError("Unable to find file descriptors in %s" % proc_dir)
 
     # identify socket fds
-    socket_matches = [re.match('socket:\\[([0-9]+)\\]', p) for p in fd_paths]
-    # extract their inode numbers
-    socket_inodes = [m.group(1) for m in socket_matches if m is not None]
+    socket_matches = (re.match('socket:\\[([0-9]+)\\]', p) for p in fd_paths)
 
     # construct a subexpression which matches any one of these inodes
-    inode_subexp = "|".join(map(re.escape, socket_inodes))
+    inode_subexp = "|".join(
+            re.escape(m.group(1))
+            for m in socket_matches 
+            if m is not None)
     # construct regexp to match /proc/net/tcp entries which are listening
     # sockets having one of the given inode numbers
     listening_regexp = re.compile(r'''