Merge lp:~rodrigo-moya/desktopcouch/no-lsof into lp:desktopcouch

[Rodrigo Moya]

[r=statik, r=tcole] Replace lsof hack with dbus call to getPort method

[Rodrigo Moya (rodrigo-moya)]

Resubmitting this again, since some files were moved while it was being approved. It contains the same code as before, plus the 2 import lines which were missing (don't know why, I had them locally, but probably missed them when submitting) in the previous merge proposal

[Tim Cole (tcole)]

review: Approve

[Elliot Murphy (statik)]

review: Approve

=== modified file 'utilities/start_local_couchdb.py'
--- utilities/start_local_couchdb.py	2009-07-09 19:44:43 +0000
+++ utilities/start_local_couchdb.py	2009-07-17 09:40:17 +0000
@@ -34,6 +34,8 @@
 from __future__ import with_statement
 import os, subprocess, sys
 import local_files
+import dbus
+from dbus.exceptions import DBusException
 
 def dump_ini(data, filename):
     """Dump INI data with sorted sections and keywords"""
@@ -107,16 +109,17 @@
     html = fp.read()
     fp.close()
 
-    # work out port number the horrible lsof way
+    # work out port number
     import time
     time.sleep(1)
-    lsofcmd = 'lsof -i4TCP@localhost | grep $(couchdb -C %s -p %s -s | ' + \
-              'cut -d" " -f7 | cut -d "," -f1) | grep "TCP " | ' + \
-              'grep LISTEN | awk \'{print $8}\' | cut -d":" -f2'
-    actual_lsof_cmd = lsofcmd % (local_files.FILE_INI, local_files.FILE_PID)
-    stdout, stderr = subprocess.Popen(actual_lsof_cmd, shell=True,
-      stdout=subprocess.PIPE).communicate()
-    port = stdout.strip()
+
+    try:
+        bus = dbus.SessionBus()
+        port_advertiser = bus.get_object("org.desktopcouch.CouchDB", "/")
+        iface = bus.Interface(port_advertiser, "org.desktopcouch.CouchDB")
+        port = iface.getPort()
+    except DBusException:
+        sys.exit(1)
 
     fp = open(bookmark_file, "w")
     fp.write(html.replace("[[COUCHDB_PORT]]", port))