Changeset 379 for trunk

Timestamp:

07/05/10 13:57:37 (11 years ago)

Author:

sander

Message:

Make the factory client run like a daemon

Location:

trunk/factory

Files:

• conf/config.default.ini (modified) (1 diff)
• src/backends/oooserver.py (modified) (1 diff)
• src/daemon.py (added)
• src/factory.py (modified) (8 diffs)

trunk/factory/conf/config.default.ini

@@ -7 +7 @@
 log_level = debug
 log_format = %(asctime)s %(levelname)s: %(message)s
+
+pidfile = /var/run/officeshots.pid
 
 xmlrpc_endpoint = https://www.officeshots.org:443/xmlrpc

trunk/factory/src/backends/oooserver.py

@@ -17 +17 @@
 from backends import Backend, BackendException
 from com.sun.star.io import IOException
-from com.sun.star.uno import RuntimeException, IllegalArgumentException
+from com.sun.star.uno import RuntimeException
+from com.sun.star.lang import IllegalArgumentException
 from com.sun.star.beans import PropertyValue
 from com.sun.star.connection import NoConnectException

trunk/factory/src/factory.py

@@ -27 +27 @@
 import socket
 import logging
+import traceback
 import ConfigParser
 
@@ -33 +34 @@
 from xmlrpclib import ServerProxy, Error, Fault
 from xml.parsers.expat import ExpatError
+from daemon import Daemon
 
 LOGLEVELS = {'debug': logging.DEBUG,
@@ -40 +42 @@
              'critical': logging.CRITICAL}
 
-class Factory:
+class Factory(Daemon):
         """
         The core factory class communicates with the Officeshots server and passes
@@ -50 +52 @@
                 self.config = ConfigParser.RawConfigParser()
                 self.config.read(os.path.abspath(self.options.config_file))
+                self.daemon = True
 
                 # Configure logging
                 if self.options.debug:
                         logging.basicConfig(format = self.config.get('global', 'log_format'), level = logging.DEBUG)
+                        self.daemon = False
                 else:
                         level = LOGLEVELS.get(self.config.get('global', 'log_level'), logging.NOTSET)
@@ -67 +71 @@
                                 sys.exit(1)
 
+                # Set the pidfile
+                self.pidfile = self.config.get('global', 'pidfile')
+
                 # Load factory name
                 self.name = self.config.get('global', 'factory_name')
 
                 # Configure the XMLRPC proxy
-                transport_name = self.config.get('global', 'transport')
-                transport = self.load('transports.' + transport_name, 'SSLTransport')
+                self.transport_name = self.config.get('global', 'transport')
+
+                # Make sure we're not using encrypted certificated in daemon mode with PySSL
+                if self.transport_name == 'pyssl' and self.daemon:
+                        encrypted = (
+                                self.is_encrypted(self.config.get('global', 'tls_key_file')) or
+                                self.is_encrypted(self.config.get('global', 'tls_certificate_file'))
+                        )
+
+                        if encrypted:
+                                logging.critical("You cannot use encrypted PEM certificates in the PySSL transport when running as a daemon")
+                                return False
+
+                return True
+
+        def load_components(self):
+                transport = self.load('transports.' + self.transport_name, 'SSLTransport')
                 if transport is None:
-                        print "Transport %s could not be loaded" % transport_name
+                        print "Transport %s could not be loaded" % self.transport_name
                         sys.exit(1)
 
@@ -127 +149 @@
                 return getattr(module, class_name)
 
-
+        def is_encrypted(self, key):
+                """
+                Check if a PEM file is encrypted
+                """
+                infile = open(key, "r")
+                keytext = infile.read()
+                infile.close()
+
+                if keytext.find("ENCRYPTED") > -1:
+                        del keytext
+                        return True
+
+                del keytext
+                return False
 
         def systemload(self):
@@ -219 +254 @@
                 """
                 logging.info('Starting factory server.')
-                while self.loop():
-                        pass
+                try:
+                        while self.loop():
+                                pass
+                except:
+                        logging.critical(traceback.format_exc())
+                        sys.exit(1)
 
 
@@ -233 +272 @@
 
         factory = Factory()
-        if factory.configure(options):
-                factory.run()
+        if not factory.configure(options):
+                logging.critical("Failed to load and parse the configuration")
+                sys.exit(1)
+
+        if len(args) == 0 or args[0] == 'start':
+                if not factory.load_components():
+                        sys.exit(1)
+
+                if factory.daemon:
+                        factory.start()
+                else:
+                        factory.run()
+        
+        elif args[0] == 'stop':
+                logging.info('Stopping factory server.')
+                factory.stop()
+
+        elif args[0] == 'restart':
+                logging.info('Retarting factory server.')
+                if not factory.load_components():
+                        sys.exit(1)
+
+                factory.restart()
+        else:
+                print "Unknown command: %s" % args[0]
+                sys.exit(2)