From 27a9907ef0d8c5fad58937ab7b9bb464bfc2ad1e Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sat, 19 Sep 2009 22:47:27 -0400
Subject: [PATCH] Added twisted based proxy server

---
 .../django/management/commands/runcomet.py    | 30 ++++++++++++++++---
 hurricane/handlers/comet/handler.py           |  2 +-
 optional-dependencies.txt                     |  3 +-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/hurricane/django/management/commands/runcomet.py b/hurricane/django/management/commands/runcomet.py
index 0f2b442..e4c87b9 100644
--- a/hurricane/django/management/commands/runcomet.py
+++ b/hurricane/django/management/commands/runcomet.py
@@ -1,11 +1,33 @@
+import os
+from subprocess import Popen
+import sys
+
+from twisted.internet import reactor
+from twisted.web import proxy, server
+
 from django.core.management.base import BaseCommand
 from django.conf import settings
 
-from hurricane.runner import main
-
 
 class Command(BaseCommand):
-    help = "Starts a lightweight Comet server for development."
+    help = ("Starts a lightweight Comet server, and django development server "
+        "for development.")
 
     def handle(self, *args, **options):
-        main(settings)
+        Popen([
+            sys.executable, 
+            sys.argv[0], 
+            'runserver', 
+            '--settings=%s' % settings.SETTINGS_MODULE
+        ])
+        Popen([
+            sys.executable, 
+            os.path.join(os.path.dirname(__file__), '..', 'runner.py'),
+            '--settings=%' % settings.SETTINGS_MODULE
+        ])
+        
+        main_site = proxy.ReverseProxyResource('localhost', 8000, '')
+        main_site.putChild('comet/',
+            proxy.ReverseProxyResource('localhost', 8001, 'comet/'))
+        reactor.listenTCP(8080, server.Site(main_site))
+        reactor.run()
diff --git a/hurricane/handlers/comet/handler.py b/hurricane/handlers/comet/handler.py
index 52f957f..577f9e2 100644
--- a/hurricane/handlers/comet/handler.py
+++ b/hurricane/handlers/comet/handler.py
@@ -166,4 +166,4 @@ def respond_to_request(self, request):
             request.write(response.as_bytes())
         except IOError:
             return
-        request.finish()
\ No newline at end of file
+        request.finish()
diff --git a/optional-dependencies.txt b/optional-dependencies.txt
index 630d9fe..e9a3cfd 100644
--- a/optional-dependencies.txt
+++ b/optional-dependencies.txt
@@ -1,4 +1,5 @@
 simplejson
 http://stomppy.googlecode.com/files/stomp.py-2.0.2.tar.gz
 -e git://github.com/facebook/tornado.git#egg=tornado
--e git://github.com/ericflo/twitstream.git#egg=twitstream
\ No newline at end of file
+-e git://github.com/ericflo/twitstream.git#egg=twitstream
+Twisted==8.2.0