summaryrefslogtreecommitdiffstats
path: root/rteval-cmd
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2013-01-04 17:29:06 +0100
committerDavid Sommerseth <davids@redhat.com>2013-01-04 17:29:06 +0100
commit8c7477a341863b760c7f4d1064d3d964049bc993 (patch)
tree502177e329d1753b624c92c7d3cb745bbde30018 /rteval-cmd
parent6ffd077bbfd47532ae4d5509602eea5f51fbf96d (diff)
downloadrteval-8c7477a341863b760c7f4d1064d3d964049bc993.tar.gz
rteval-8c7477a341863b760c7f4d1064d3d964049bc993.tar.xz
rteval-8c7477a341863b760c7f4d1064d3d964049bc993.zip
Move the configuration defaults from rteval-cmd and into the rtevalConfig module
This is to make it easier to apply default values when importing the rteval module from other places than rteval-cmd. Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'rteval-cmd')
-rwxr-xr-xrteval-cmd22
1 files changed, 1 insertions, 21 deletions
diff --git a/rteval-cmd b/rteval-cmd
index a2bfb47..461ab05 100755
--- a/rteval-cmd
+++ b/rteval-cmd
@@ -180,32 +180,12 @@ if __name__ == '__main__':
dmi.ProcessWarnings()
try:
- default_config = {
- 'rteval': {
- 'quiet' : False,
- 'verbose' : False,
- 'keepdata' : True,
- 'debugging' : False,
- 'duration' : '60',
- 'sysreport' : False,
- 'reportdir' : None,
- 'reportfile' : None,
- 'workdir' : os.getcwd(),
- 'installdir' : '/usr/share/rteval',
- 'srcdir' : '/usr/share/rteval/loadsource',
- 'xmlrpc' : None,
- 'xslt_report': '/usr/share/rteval/rteval_text.xsl',
- 'report_interval': '600',
- 'logging' : False,
- }
- }
-
# Prepare logging
logger = Log()
logger.SetLogVerbosity(Log.INFO)
# setup initial configuration
- config = rtevalConfig.rtevalConfig(default_config, logger=logger)
+ config = rtevalConfig.rtevalConfig(logger=logger)
# Before really parsing options, see if we have been given a config file in the args
# and load it - just so that default values are according to the config file