Changeset 548

Timestamp:

10/10/08 08:26:54 (6 weeks ago)

Author:

heyadayo

Message:

Auto detect Orbited.settings.hostname and Orbited.settings.port; Required morbid for install; Allow Orbited to use morbid to act as an embedded stomp broker.

Location:

trunk/daemon

Files:

• orbited-debug.cfg (modified) (1 diff)
• orbited/config.py (modified) (1 diff)
• orbited/start.py (modified) (4 diffs)
• orbited/static/Orbited.js (modified) (1 diff)
• setup.py (modified) (1 diff)

trunk/daemon/orbited-debug.cfg

@@ -2 +2 @@
 reactor=epoll
 proxy.enabled=1
+morbid.enabled=1
 session.ping_interval = 60
 session.ping_timeout = 70

trunk/daemon/orbited/config.py

@@ -8 +8 @@
         #'reactor': 'epoll',
 
-        #'proxy.enabled': '1',
-
+        'proxy.enabled': '1',
         'pid.location': '/tmp/orbited.pid',
         'session.ping_interval': '30',

trunk/daemon/orbited/start.py

@@ -25 +25 @@
             reactor.listenWith(port_class, factory=factory_class(), resource=root, childName=child_path)
             logger.info('%s protocol active' % config_key)
-
+    
 def _setup_static(root, config):
     from twisted.web import static
@@ -46 +46 @@
     global logger; logger = logging.get_logger('orbited.start')
 
+
     # NB: we need to install the reactor before using twisted.
     reactor_name = config.map['[global]'].get('reactor')
@@ -61 +62 @@
     static_files = static.File(os.path.join(os.path.dirname(__file__), 'static'))
     root.putChild('static', static_files)
+    #static_files.putChild('orbited.swf', static.File(os.path.join(os.path.dirname(__file__), 'flash', 'orbited.swf')))
     site = server.Site(root)
 
@@ -70 +72 @@
 def start_listening(site, config, logger):
     from twisted.internet import reactor
+    # allow stomp:// URIs to be parsed by urlparse 
+    urlparse.uses_netloc.append('stomp')
+
     for addr in config['[listen]']:
         url = urlparse.urlparse(addr)
         hostname = url.hostname or ''
-        if url.scheme == 'http':
+        if url.scheme == 'stomp':
+            logger.info('Listening stomp@%s' % url.port)
+            from morbid import StompFactory
+            reactor.listenTCP(url.port, StompFactory(), interface=hostname)     
+        elif url.scheme == 'http':
             logger.info('Listening http@%s' % url.port)
             reactor.listenTCP(url.port, site, interface=hostname)

trunk/daemon/orbited/static/Orbited.js

@@ -2531 +2531 @@
 Orbited.JSON = JSON;
 
+
 })();
+
+
+// Try to auto detect the Orbited port and hostname
+(function() {
+try {
+    var scripts = document.getElementsByTagName('script')
+    for (var i = 0; i < scripts.length; ++i) {
+        var script = scripts[0]
+        if (script.src.match('/static/Orbited\.js$')) {
+            var url = new Orbited.URL(script.src)
+            Orbited.settings.hostname = url.domain;
+            Orbited.settings.port = url.port;
+            break
+        }
+    }
+} catch(e) { }
+})()

trunk/daemon/setup.py

@@ -15 +15 @@
 ]
 
-_install_requires = [ "demjson" ]
+_install_requires = [ "demjson", "morbid" ]
 
 #if sys.platform != "win32":