summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-12-20 17:35:26 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-12-20 17:35:26 +0000
commitd1c1b507251af414cd17c84df60131e80ce80439 (patch)
tree7e0d1d1556e192950be2a50046f1a12cfb0fad98
parentb43699d1f4e38446688dc626743cb4495421ed6f (diff)
downloadbcfg2-d1c1b507251af414cd17c84df60131e80ce80439.tar.gz
bcfg2-d1c1b507251af414cd17c84df60131e80ce80439.tar.bz2
bcfg2-d1c1b507251af414cd17c84df60131e80ce80439.zip
bcfg2-server: Enable logging to file (fixes #817) [bugfix]
Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5627 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Component.py9
-rwxr-xr-xsrc/sbin/bcfg2-server1
2 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/Component.py b/src/lib/Component.py
index 58d893cd5..a96e4c87d 100644
--- a/src/lib/Component.py
+++ b/src/lib/Component.py
@@ -23,8 +23,8 @@ logger = logging.getLogger()
class NoExposedMethod (Exception):
"""There is no method exposed with the given name."""
-def run_component(component_cls, location, daemon, pidfile_name, argv=None,
- register=True, state_name=False, cls_kwargs={},
+def run_component(component_cls, location, daemon, pidfile_name, to_file,
+ argv=None, register=True, state_name=False, cls_kwargs={},
extra_getopt='', time_out=10, protocol='xmlrpc/ssl',
certfile=None, keyfile=None, ca=None):
@@ -32,7 +32,10 @@ def run_component(component_cls, location, daemon, pidfile_name, argv=None,
level = logging.INFO
logging.getLogger().setLevel(level)
- Bcfg2.Logger.setup_logging(component_cls.implementation, True, True)
+ Bcfg2.Logger.setup_logging(component_cls.implementation,
+ True,
+ True,
+ to_file=to_file)
if daemon:
child_pid = os.fork()
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 06ad53768..910d1857f 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -22,6 +22,7 @@ if __name__ == '__main__':
'debug' : Bcfg2.Options.DEBUG,
'help' : Bcfg2.Options.HELP,
'verbose' : Bcfg2.Options.VERBOSE,
+ 'to_file' : Bcfg2.Options.LOGGING_FILE_PATH,
}
OPTINFO.update({'repo': Bcfg2.Options.SERVER_REPOSITORY,