From 425f61b97305e9a44d9f31c8a82c633c95f61edc Mon Sep 17 00:00:00 2001
From: James Bowes <jbowes@redhat.com>
Date: Thu, 20 Sep 2007 18:27:11 -0400
Subject: Catch FuncException when the config file is missing and exit
 gracefully

---
 server/config_data.py | 2 +-
 server/server.py      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'server')

diff --git a/server/config_data.py b/server/config_data.py
index b9a4bc8..7ace8ca 100755
--- a/server/config_data.py
+++ b/server/config_data.py
@@ -35,7 +35,7 @@ class Config:
     def read(self):
 
         if not os.path.exists(CONFIG_FILE):
-            raise FuncException(comment="Missing %s" % CONFIG_FILE)
+            raise FuncException("Missing %s" % CONFIG_FILE)
 
         cp = ConfigParser.ConfigParser()
 
diff --git a/server/server.py b/server/server.py
index 3069d0a..a313301 100755
--- a/server/server.py
+++ b/server/server.py
@@ -153,7 +153,11 @@ def main(argv):
     modules = module_loader.load_modules()
     print "modules", modules
 
-    websvc = XmlRpcInterface(modules=modules)
+    try:
+        websvc = XmlRpcInterface(modules=modules)
+    except FuncException, e:
+        print >> sys.stderr, 'error: %s' % e
+        sys.exit(1)
 
     if "daemon" in sys.argv or "--daemon" in sys.argv:
         utils.daemonize("/var/run/vf_server.pid")
-- 
cgit 


From 393fc312b9af104b729f12a344c6b44aa7a76b96 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com>
Date: Thu, 20 Sep 2007 18:28:18 -0400
Subject: Prevent XMLRPC server from printing to console.

---
 server/server.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'server')

diff --git a/server/server.py b/server/server.py
index a313301..0106109 100755
--- a/server/server.py
+++ b/server/server.py
@@ -130,6 +130,7 @@ def serve(websvc):
      """
 
      server =FuncXMLRPCServer(('', 51234))
+     server.logRequests = 0 # don't print stuff to console
      server.register_instance(websvc)
      server.serve_forever()
 
-- 
cgit 


From fcf925c36f22d2eee1de1f7815915cf5ba17fbb3 Mon Sep 17 00:00:00 2001
From: James Bowes <jbowes@redhat.com>
Date: Thu, 20 Sep 2007 18:45:13 -0400
Subject: Get rid of extra / in module loading error

---
 server/module_loader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/module_loader.py b/server/module_loader.py
index a18da35..f189623 100755
--- a/server/module_loader.py
+++ b/server/module_loader.py
@@ -47,7 +47,7 @@ def load_modules(blacklist=None):
         try:
             blip =  __import__("modules.%s" % ( modname), globals(), locals(), [modname])
             if not hasattr(blip, "register_rpc"):
-		errmsg = _("%(module_path)s/%(modname)s module not a proper module")
+		errmsg = _("%(module_path)s%(modname)s module not a proper module")
                 print errmsg % {'module_path': module_file_path, 'modname':modname} 
                 continue
             mods[modname] = blip
-- 
cgit