Merge lp:~sil/desktopcouch/logging-find-port-linux-461114 into lp:desktopcouch

[Stuart Langridge]

Add extra logging to try and determine why bug#461114 happens (couldn't find a port in find_port_linux).

[Stuart Langridge (sil)]

Add extra logging to try and determine why bug 461114 happens (couldn't find a port in find_port_linux).

[Vincenzo Di Somma (vds)]

Looks good.

review: Approve

[Eric Casteleijn (thisfred)]

Looking good, tests pass

review: Approve

[Chad Miller (cmiller)]

review: Approve

=== modified file 'desktopcouch/__init__.py'
--- desktopcouch/__init__.py	2009-09-09 23:24:53 +0000
+++ desktopcouch/__init__.py	2009-10-29 22:05:20 +0000
@@ -16,21 +16,43 @@
 "Desktop Couch helper files"
 
 from __future__ import with_statement
-import os, re
+import os, re, xdg.BaseDirectory
 from desktopcouch.start_local_couchdb import process_is_couchdb, read_pidfile
 
+import logging, logging.handlers
+log_directory = os.path.join(xdg.BaseDirectory.xdg_cache_home,
+        "desktop-couch/log")
+try:
+    os.makedirs(log_directory)
+except:
+    pass
+rotating_log = logging.handlers.TimedRotatingFileHandler(
+        os.path.join(log_directory, "desktop-couch-startup.log"),
+        "midnight", 1, 14)
+rotating_log.setLevel(logging.DEBUG)
+formatter = logging.Formatter('%(asctime)s %(levelname)-8s %(message)s')
+rotating_log.setFormatter(formatter)
+console_log = logging.StreamHandler()
+console_log.setLevel(logging.WARNING)
+console_log.setFormatter(logging.Formatter("%(asctime)s - %(message)s"))
+logging.getLogger('').addHandler(console_log)
+logging.getLogger('').addHandler(rotating_log)
+logging.getLogger('').setLevel(logging.DEBUG)
+log = logging.getLogger('')
+
 def find_pid(start_if_not_running=True):
     # Work out whether CouchDB is running by looking at its pid file
     pid = read_pidfile()
     if not process_is_couchdb(pid) and start_if_not_running:
         # start CouchDB by running the startup script
-        print "Desktop CouchDB is not running; starting it.",
+        log.info("Desktop CouchDB is not running; starting it.")
         from desktopcouch import start_local_couchdb
         pid = start_local_couchdb.start_couchdb()
         # now load the design documents, because it's started
         start_local_couchdb.update_design_documents()
 
         if not process_is_couchdb(pid):
+            log.error("CouchDB process did not start up")
             raise RuntimeError("desktop-couch not started")
 
     return pid
@@ -47,6 +69,7 @@
         fd_paths = [os.readlink(os.path.join(fd_dir, fd))
                     for fd in os.listdir(fd_dir)]
     except OSError:
+        log.error("Unable to find file descriptors in /proc")
         raise RuntimeError("Unable to find file descriptors in /proc")
 
     # identify socket fds
@@ -82,6 +105,11 @@
                 port = str(int(match.group(1), 16))
                 break
     if port is None:
+        log.error("Unable to find listening port")
+        log.error("Looked at the following processes for inode %s:" % inode_subexp)
+        fp = open(os.path.join(proc_dir, 'net', 'tcp'))
+        log.error(fp.read())
+        fp.close()
         raise RuntimeError("Unable to find listening port")
 
     return port
@@ -95,4 +123,5 @@
         "Linux": find_port__linux
         } [os_name]
 except KeyError:
+    log.error("os %r is not yet supported" % (os_name,))
     raise NotImplementedError("os %r is not yet supported" % (os_name,))