Ticket #2933: r3909-bonjour.patch.diff

django/core/management.py

@@ -6 +6 @@
 import os, re, shutil, sys, textwrap
 from optparse import OptionParser
 from django.utils import termcolors
+import atexit
 
 # For Python 2.3
 if not hasattr(__builtins__, 'set'):
@@ -1084 +1085 @@
         sys.stderr.write(s.read())
         sys.exit(1)
 
-def runserver(addr, port, use_reloader=True, admin_media_dir=''):
+DNS_SD_PID = None
+#code adopted from turbogears startup.py which is MIT licensed
+#http://www.turbogears.org/svn/turbogears/trunk/turbogears/startup.py
+def _start_bonjour(host, port):
+    global DNS_SD_PID
+    if DNS_SD_PID:
+        return
+        
+    #only local. works right now
+    host = '.'
+    type = "_http._tcp"
+    from django.conf import settings
+    name  = settings.SETTINGS_MODULE
+
+    cmds = [['/usr/bin/avahi-publish-service', ["-H", host, name, type, port]],
+            ['/usr/bin/dns-sd', ['-R', name, type, host, port, "path=/"]]]
+
+    for cmd, args in cmds:
+        # TODO:. This check is flawed.  If one has both services installed and
+        # avahi isn't the one running, then this won't work.  We should either
+        # try registering with both or checking what service is running and use
+        # that.  Program availability on the filesystem was never enough...
+        if os.path.exists(cmd):
+            DNS_SD_PID = os.spawnv(os.P_NOWAIT, cmd, [cmd]+args)
+            atexit.register(_stop_bonjour)
+            break
+
+def _stop_bonjour():
+    if not DNS_SD_PID:
+        return
+    try:
+        os.kill(DNS_SD_PID, 15)
+    except OSError:
+        pass
+
+def runserver(addr, port, use_reloader=True, admin_media_dir='', use_bonjour=False):
     "Starts a lightweight Web server for development."
     from django.core.servers.basehttp import run, AdminMediaHandler, WSGIServerException
     from django.core.handlers.wsgi import WSGIHandler
@@ -1118 +1154 @@
             except (AttributeError, KeyError):
                 error_text = str(e)
             sys.stderr.write(style.ERROR("Error: %s" % error_text) + '\n')
+            _stop_bonjour()
             sys.exit(1)
         except KeyboardInterrupt:
+            _stop_bonjour()
             sys.exit(0)
+    if use_bonjour:
+        _start_bonjour(addr, port)
     if use_reloader:
         from django.utils import autoreload
         autoreload.main(inner_run)
     else:
         inner_run()
-runserver.args = '[--noreload] [--adminmedia=ADMIN_MEDIA_PATH] [optional port number, or ipaddr:port]'
+runserver.args = '[--noreload] [--adminmedia=ADMIN_MEDIA_PATH] [--bonjour] [optional port number, or ipaddr:port]'
 
 def createcachetable(tablename):
     "Creates the table needed to use the SQL cache backend"
@@ -1310 +1350 @@
         help='Tells Django to NOT prompt the user for input of any kind.')
     parser.add_option('--noreload', action='store_false', dest='use_reloader', default=True,
         help='Tells Django to NOT use the auto-reloader when running the development server.')
+    parser.add_option('--bonjour', action='store_true', dest='use_bonjour',
+        help='Tells Django to try to use Bonjour make the development server known.')
     parser.add_option('--verbosity', action='store', dest='verbosity', default='1',
         type='choice', choices=['0', '1', '2'],
         help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
@@ -1377 +1419 @@
                 addr, port = args[1].split(':')
             except ValueError:
                 addr, port = '', args[1]
-        action_mapping[action](addr, port, options.use_reloader, options.admin_media_path)
+        action_mapping[action](addr, port, options.use_reloader, options.admin_media_path, options.use_bonjour)
     elif action == 'runfcgi':
         action_mapping[action](args[1:])
     else: