Changeset 380 for trunk

Timestamp:

07/05/10 14:13:56 (11 years ago)

Author:

sander

Message:

Make factory running as daemon optional

File:

• trunk/factory/src/factory.py (modified) (3 diffs)

trunk/factory/src/factory.py

@@ -52 +52 @@
                 self.config = ConfigParser.RawConfigParser()
                 self.config.read(os.path.abspath(self.options.config_file))
-                self.daemon = True
+
+                try:
+                        self.daemon = self.config.getboolean('global', 'daemon')
+                except ConfigParser.NoOptionError, e:
+                        self.daemon = False
 
                 # Configure logging
@@ -72 +76 @@
 
                 # Set the pidfile
-                self.pidfile = self.config.get('global', 'pidfile')
+                try:
+                        self.pidfile = self.config.get('global', 'pidfile')
+                except ConfigParser.NoOptionError, e:
+                        if self.daemon:
+                                raise
+                        self.pidfile = '/tmp/pydaemon.pid'
 
                 # Load factory name
@@ -264 +273 @@
 
 if __name__ == "__main__":
-        parser = OptionParser(usage='Usage: %prog [options]')
+        parser = OptionParser(usage='Usage: %prog [options] start|stop|restart')
         parser.add_option('-c', '--config-file', action='store', type='string', dest='config_file',
                         default='../conf/config.ini', help='Full path to the configuration file to read.')