revisor/base.py | 38 ++++++++-----
revisor/modhub/__init__.py | 124 ++++++++++++++++++++++-----------------------
2 files changed, 85 insertions(+), 77 deletions(-)
New commits:
commit efe46471a01aedd2c1bd8ae4f93e8c08ef1af001
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Fri Dec 12 14:17:13 2008 +0100
Fix the indentation. Use 4 spaces to a tab
diff --git a/revisor/base.py b/revisor/base.py
index 0348035..1bc9efe 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -104,21 +104,29 @@ class RevisorBase:
self.log.debug(_("Running Revisor in CLI mode..."), level=1)
self.cli = revisor.cli.RevisorCLI(self)
self.cli.run()
- elif hasattr(self.cfg,"server_mode"):
- # added hubmode
- if self.cfg.hub_mode:
- self.log.debug(_("Running Revisor in Hub mode..."), level=1)
- self.server = self.plugins.modhub
- self.cfg.gui_mode = False #hack!
- self.server.run(base=self)
- elif self.cfg.server_mode:
- self.log.debug(_("Running Revisor in RPC Server mode..."), level=1)
- self.server = self.plugins.modserver
- self.server.run(base=self)
- elif self.cfg.gui_mode:
- self.log.debug(_("Running Revisor in GUI mode..."), level=1)
- self.gui = self.plugins.modgui
- self.gui.run(base=self)
+ elif hasattr(self.cfg,"server_mode") or
hasattr(self.cfg."hub_mode"):
+ # Check hub_mode,
+ # Then check server_mode,
+ # If we have both attributes, but none is set, fall back to GUI mode
+ if self.cfg.hub_mode:
+ self.log.debug(_("Running Revisor in Hub mode..."), level=1)
+ self.hub = self.plugins.modhub
+ self.cfg.gui_mode = False #hack!
+ self.hub.run(base=self)
+ elif self.cfg.server_mode:
+ self.log.debug(_("Running Revisor in RPC Server mode..."),
level=1)
+ self.server = self.plugins.modserver
+ self.server.run(base=self)
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
+
+ # And, finally, fall back to GUI mode
+ elif self.cfg.gui_mode:
+ self.log.debug(_("Running Revisor in GUI mode..."), level=1)
+ self.gui = self.plugins.modgui
+ self.gui.run(base=self)
def create_logger(self):
"""Create a logger instance using
cli_options.debuglevel"""
diff --git a/revisor/modhub/__init__.py b/revisor/modhub/__init__.py
index 4af145c..85d8937 100644
--- a/revisor/modhub/__init__.py
+++ b/revisor/modhub/__init__.py
@@ -12,94 +12,94 @@ import os
#import logger.Logger
class RevisorHub():
- """ Hub Mode """
-
- def __init__(self):
- # blaat
- print "HELLO HUB!!!!!!!"
-
- def do_xmlrpc(self, cfg):
- """ Get our xmlrpc hub running. """
- xinterface = RevisorXMLRPCInterface(cfg)
- hub = RevisorXMLRPCServer(('', int(cfg.hub_port)))
- hub.register_introspection_functions()
- cfg.log.info("XMLRPC Server running on port %s" % cfg.hub_port)
- hub.register_instance(xinterface)
- while True:
- try:
- hub.serve_forever()
- except IOError:
- # interrupted? try to serve again
- time.sleep(0.5)
-
- def run(self, base):
- print "HUB mode started!"
- if base.cfg.fork_mode:
- pid = os.fork()
- self.do_xmlrpc(base.cfg)
- else:
- try:
- self.do_xmlrpc(base.cfg)
- pass
- except KeyboardInterrupt:
+ """ Hub Mode """
+
+ def __init__(self):
+ # blaat
+ print "HELLO HUB!!!!!!!"
+
+ def do_xmlrpc(self, cfg):
+ """ Get our xmlrpc hub running. """
+ xinterface = RevisorXMLRPCInterface(cfg)
+ hub = RevisorXMLRPCServer(('', int(cfg.hub_port)))
+ hub.register_introspection_functions()
+ cfg.log.info("XMLRPC Server running on port %s" % cfg.hub_port)
+ hub.register_instance(xinterface)
+ while True:
+ try:
+ hub.serve_forever()
+ except IOError:
+ # interrupted? try to serve again
+ time.sleep(0.5)
+
+ def run(self, base):
+ print "HUB mode started!"
+ if base.cfg.fork_mode:
+ pid = os.fork()
+ self.do_xmlrpc(base.cfg)
+ else:
+ try:
+ self.do_xmlrpc(base.cfg)
+ pass
+ except KeyboardInterrupt:
#base.log.info("Shutting down...")
- pass
-
- def add_options(self, parser):
- modhub_group = parser.add_option_group("Hub Options")
- modhub_group.add_option( "--hub",
+ pass
+
+ def add_options(self, parser):
+ modhub_group = parser.add_option_group("Hub Options")
+ modhub_group.add_option( "--hub",
dest = "hub_mode",
action = "store_true",
default = False,
help = _("Use the Hub mode for distributed
composing."))
- modhub_group.add_option( "--hub-port",
+ modhub_group.add_option( "--hub-port",
dest = "hub_port",
action = "store",
default = "9321",
help = _("Port to start Hub mode on."),
metavar = "[hub-port]")
- modhub_group.add_option("--forkhub",
- dest = "forkhub_mode",
- action = "store",
- default = False,
- help = _("Start the Hub mode and fork."),
- metavar = "[boolean]")
-
- #def check_options(self, cfg, cli_options):
+ modhub_group.add_option("--forkhub",
+ dest = "forkhub_mode",
+ action = "store",
+ default = False,
+ help = _("Start the Hub mode and fork."),
+ metavar = "[boolean]")
+
+ #def check_options(self, cfg, cli_options):
# Cheater! Found a cheater!
- #print cli_options.server_mode
+ #print cli_options.server_mode
#if cli_options.server_mode:
- #cfg.server_mode = False
- #cfg.hub_mode = True
+ #cfg.server_mode = False
+ #cfg.hub_mode = True
#cfg.gui_mode = False
#cfg.cli_mode = False
- #print "blaat"
+ #print "blaat"
#pass
-
- def set_defaults(self, defaults):
- #defaults.db_server = x.x.x.x
- #defaults.db_type = mysql #for later development
- #defaults.setport = "3306"
- #defaults.username = "blaat"
- #defaults.password = "pass"
- #defaults.dbname = "revisor-hubdb"
- #defaults.configfile = "blaat"
- pass
+
+ def set_defaults(self, defaults):
+ #defaults.db_server = x.x.x.x
+ #defaults.db_type = mysql #for later development
+ #defaults.setport = "3306"
+ #defaults.username = "blaat"
+ #defaults.password = "pass"
+ #defaults.dbname = "revisor-hubdb"
+ #defaults.configfile = "blaat"
+ pass
class RevisorXMLRPCInterface(object):
""" Functionality to expose to the XML-RPC interface.
"""
def __init__(self, cfg=None):
- #if cfg == None:
+ #if cfg == None:
# FIXME: Initialize ConfigStore or return Error
#pass
#else:
- #self.cfg = cfg
-
+ #self.cfg = cfg
+
#self.sessions = dict()
#self.next_session = 0
- pass
+ pass
class Session(object):