Commits

desmaj committed c2eebc4

updated the MANIFEST to include the orbited example config file; removed the selenium server jar because it's huge; fixed config loading so that we can use /etc/orbited.cfg again

Comments (0)

Files changed (7)

 recursive-include orbited *
+include orbited.cfg.example
 include MANIFEST.inc
 include NEWS
 include README.testing

daemon/README.testing

 -------------
 * Java must be installed
 * Firefox must be installed
+* The standalone Selenium server jar - this should be available at http://selenium.googlecode.com/files/selenium-server-standalone-2.0a4.jar.
 
 /etc/hosts
 ----------
 Terminal 1 - (selenium)
 +++++++++++++++++++++++
 
-java -jar orbited/test/resources/selenium-server-standalone-2.0a4.jar 
+java -jar /path/to/selenium-server-standalone-2.0a4.jar 
 
 Terminal 2 - (orbited)
 ++++++++++++++++++++++

daemon/orbited.cfg

-# Example Orbited Configuration file
-
-[global]
-reactor=select
-# reactor=kqueue
-# reactor=epoll
-proxy.enabled=1
-session.ping_interval = 40
-session.ping_timeout = 30
-# once the sockets are open, orbited will drop its privileges to this user.
-# user=orbited
-
-[listen]
-http://:8000
-# uncomment to enable SSL on port 8043 using given .key and .crt files
-#https://:8043
-#
-#[ssl]
-#key=orbited.key
-#crt=orbited.crt
-#chain=orbited.chain
-
-[static]
-
-[access]
-localhost:8000 -> irc.freenode.net:6667
-* -> localhost:4747
-
-# new logging configuration using the python stdlib logging.fileConfig
-[loggers]
-keys = root,orbited,orbited_TCPConnectionResource
-
-[handlers]
-keys = console,errors,connections
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = NOTSET
-handlers = console
-
-[logger_orbited]
-level = WARN
-handlers = errors
-qualname = orbited
-
-[logger_orbited_TCPConnectionResource]
-level = DEBUG
-handlers = connections
-qualname = orbited.cometsession.TCPConnectionResource
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = INFO
-formatter = generic
-
-[handler_errors]
-class = FileHandler
-args = ('error.log', 'w')
-level = WARN
-formatter = generic
-
-[handler_connections]
-class = FileHandler
-level = DEBUG
-formatter = generic
-args = ('connections.log', 'w')
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s

daemon/orbited.cfg.example

+# Example Orbited Configuration file
+
+[global]
+reactor=select
+# reactor=kqueue
+# reactor=epoll
+proxy.enabled=1
+session.ping_interval = 40
+session.ping_timeout = 30
+# once the sockets are open, orbited will drop its privileges to this user.
+# user=orbited
+
+[listen]
+http://:8000
+# uncomment to enable SSL on port 8043 using given .key and .crt files
+#https://:8043
+#
+#[ssl]
+#key=orbited.key
+#crt=orbited.crt
+#chain=orbited.chain
+
+[static]
+
+[access]
+localhost:8000 -> irc.freenode.net:6667
+* -> localhost:4747
+
+# new logging configuration using the python stdlib logging.fileConfig
+[loggers]
+keys = root,orbited,orbited_TCPConnectionResource
+
+[handlers]
+keys = console,errors,connections
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = NOTSET
+handlers = console
+
+[logger_orbited]
+level = WARN
+handlers = errors
+qualname = orbited
+
+[logger_orbited_TCPConnectionResource]
+level = DEBUG
+handlers = connections
+qualname = orbited.cometsession.TCPConnectionResource
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = INFO
+formatter = generic
+
+[handler_errors]
+class = FileHandler
+args = ('error.log', 'w')
+level = WARN
+formatter = generic
+
+[handler_connections]
+class = FileHandler
+level = DEBUG
+formatter = generic
+args = ('connections.log', 'w')
+
+[formatter_generic]
+format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s

daemon/orbited/_version.py

-__version__ = "0.7.11beta2"
+__version__ = "0.7.11beta3"

daemon/orbited/start.py

         print "Orbited version: %s" % (version,)
         sys.exit(0)
     
-    logging.config.fileConfig(options.config)
     global logger
-    logger = logging.getLogger(__name__)
     
     if options.quickstart:
+        logging.basicConfig()
+        logger = logging.getLogger(__name__)
         config.map['[listen]'].append('http://:8000')
         config.map['[listen]'].append('stomp://:61613')
         config.map['[access]'][('localhost',61613)] = ['*']
         # load configuration from configuration
         # file and from command line arguments.
         config.setup(options=options)
-
+        logging.config.fileConfig(options.config)
+        logger = logging.getLogger(__name__)
+        logger.info("Starting Orbited with config file %s" % options.config)
+    
     if options.daemon:
         try:
             from daemon import DaemonContext

daemon/orbited/test/resources/selenium-server-standalone-2.0a4.jar

Binary file removed.