summaryrefslogtreecommitdiffstats
path: root/rteval
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2010-04-12 17:48:26 +0200
committerDavid Sommerseth <davids@redhat.com>2010-04-12 17:48:26 +0200
commit8c2752855c05d92ad9e7d8c7086a3f1a917a3d4d (patch)
tree60afd09669c0c7c776148d0a03498e814d5ee37b /rteval
parentf2559030ac7703a0af4009978c09d82f0dd23f72 (diff)
downloadrteval-8c2752855c05d92ad9e7d8c7086a3f1a917a3d4d.tar.gz
rteval-8c2752855c05d92ad9e7d8c7086a3f1a917a3d4d.tar.xz
rteval-8c2752855c05d92ad9e7d8c7086a3f1a917a3d4d.zip
Added -P/--xmlrpc-no-abort to avoid exiting if XML-RPC ping fails
This is to make automated tests using rteval behave better, where rteval runs might go for several hours - and the XML-RPC server might become available during that time. In addition, rteval will try several times to send the report as well.
Diffstat (limited to 'rteval')
-rw-r--r--rteval/rteval.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/rteval/rteval.py b/rteval/rteval.py
index 90c2cdb..bc72544 100644
--- a/rteval/rteval.py
+++ b/rteval/rteval.py
@@ -191,7 +191,11 @@ class RtEval(object):
ping_failed = True
if ping_failed:
- sys.exit(2)
+ if not self.cmd_options.xmlrpc_noabort:
+ print "ERROR: Could not reach XML-RPC server '%s'. Aborting." % self.config.xmlrpc
+ sys.exit(2)
+ else:
+ print "WARNING: Could not ping the XML-RPC server. Will continue anyway."
if res:
self.info("Verified XML-RPC connection with %s (XML-RPC API version: %i)"
@@ -344,6 +348,9 @@ class RtEval(object):
parser.add_option("-X", '--xmlrpc-submit', dest='xmlrpc',
action='store', default=self.config.xmlrpc, metavar='HOST',
help='Hostname to XML-RPC server to submit reports')
+ parser.add_option("-P", "--xmlrpc-no-abort", dest="xmlrpc_noabort",
+ action='store_true', default=False,
+ help="Do not abort if XML-RPC server do not respond to ping request");
parser.add_option("-Z", '--summarize', dest='summarize',
action='store_true', default=False,
help='summarize an already existing XML report')