Changeset 311

Timestamp:

06/25/08 00:34:56 (2 months ago)

Author:

heyadayo

Message:

New configuration options for serving static content

Location:

branches/0.5/daemon/orbited

Files:

• config.py (modified) (3 diffs)
• control.py (modified) (5 diffs)
• logger/test.py (modified) (2 diffs)
• start.py (modified) (3 diffs)

branches/0.5/daemon/orbited/config.py

@@ -4 +4 @@
 map = {
     '[global]': {
-        'dispatch.enabled': '0'
+        'dispatch.enabled': '0',
+        'pid.location': '/tmp/orbited.pid'
     },
     '[logging]': {
@@ -27 +28 @@
     '[global]': {
         'dispatch.enabled': '1',
-        'dispatch.port': '9000'
+        'dispatch.port': '9000',
     },
     '[access]': [
@@ -73 +74 @@
         pass
     print "Could not locate configuration file. Using default configuration"
+    for key, val in defaults.items():
+        if isinstance(map.get(key), dict):
+            map[key].update(val)
+        else:
+            map[key] = val
     map.update(defaults)
     

branches/0.5/daemon/orbited/control.py

@@ -6 +6 @@
 from start import logger
 from start import main as orbited_main
+from config import map as config
+
+pid_location = config['[global]']['pid.location']
 
 def start():
     print "Starting Orbited Daemon"
-    checkpidfile = open('/tmp/orbited.pid', 'a')
+    
+    checkpidfile = open(pid_location, 'a')
     try:
         fcntl.lockf(checkpidfile , fcntl.LOCK_EX|fcntl.LOCK_NB)
@@ -53 +57 @@
         # Try to get an exclusive lock on the file.  This will fail
         # if another process has the file locked.
-        pidfile = open('/tmp/orbited.pid', 'w')    
+        pidfile = open(pid_location, 'w')    
         logger.debug('d3')
         fcntl.lockf(pidfile, fcntl.LOCK_EX|fcntl.LOCK_NB)
@@ -67 +71 @@
 def stop():
     print "Stopping Orbited Daemon"
-    wpidfile = open('/tmp/orbited.pid', 'a')  
+    checkpidfile = open(pid_location, 'a')  
     try:
-        fcntl.lockf(wpidfile, fcntl.LOCK_EX|fcntl.LOCK_NB)
-        fcntl.lockf(wpidfile, fcntl.LOCK_UN)
+        fcntl.lockf(checkpidfile, fcntl.LOCK_EX|fcntl.LOCK_NB)
+        fcntl.lockf(checkpidfile, fcntl.LOCK_UN)
     except IOError:
         pass
@@ -77 +81 @@
         raise SystemExit
       
-    rpidfile = open('/tmp/orbited.pid', 'r')
+    rpidfile = open(pid_location, 'r')
     try:
         pid = int(rpidfile.read())
     except ValueError:
-        print "Invalid pid file: /tmp/orbited.pid"
+        print "Invalid pid file: %s" % (pid_location,)
         raise SystemExit
     
@@ -95 +99 @@
 
 def status():
-    wpidfile = open('/tmp/orbited.pid', 'a')  
+    wpidfile = open(pid_location, 'a')  
     try:
         fcntl.lockf(wpidfile, fcntl.LOCK_EX|fcntl.LOCK_NB)

branches/0.5/daemon/orbited/logger/test.py

@@ -1 @@
-if True:
+if False:
     import log
     config = {
@@ -11 +11 @@
         },
         '[loggers]': {
-            'access': 1,
+            'ACCESS': 1,
             'HTTPDaemon': '2',
         }

branches/0.5/daemon/orbited/start.py

@@ -8 +8 @@
 #from revolved import RevolvedConnection
 logger = get_logger('Daemon')
+#if 'INDEX' in config['[static]']:
+#    print 'index found', config['[static]']['INDEX']
+#    root = static.File(config['[static]']['INDEX'])
+#else:
 root = resource.Resource()
 static_files = static.File(os.path.join(os.path.split(__file__)[0], 'static'))
@@ -13 +17 @@
 site = server.Site(root)
 
+def setup_static(taken):
+    for key, val in config['[static]'].items():
+        if key in taken:
+            logger.error("cannot mount static directory with reserved name %s" % key)
+            sys.exit(0)
+        if key == 'INDEX':
+            key = ''
+        root.putChild(key, static.File(val))
 
 def main():
@@ -26 +38 @@
     if config['[global]']['dispatch.enabled'] == '1':
         root.putChild('legacy', DispatchFactory())
-        
+    setup_static(['echo', 'proxy', 'binaryproxy', 'websocket'])
     for addr in config['[listen]']:
         url = urlparse.urlparse(addr)