particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make ClientSession retries more configurable, and more robust

Browse source 
add an offline mode to the hub (ServerOffline fault)
report offline status if db connection fails
adjust retry timings for kojid and kojira
This commit is contained in:
Mike McLean 2008-02-22 11:26:27 -05:00
parent 41b278ccca
commit 69d841a63b
4 changed files with 71 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
builder/kojid
View file

@ -2656,6 +2656,10 @@ def get_options():
'server': None,
'user': None,
'password': None,
'retry_interval': 60,
'max_retries': 120,
'offline_retry': True,
'offline_retry_interval': 120,
'pkgurl': None,
'allowed_scms': '',
'cert': '/etc/kojid/client.crt',
@ -2663,7 +2667,8 @@ def get_options():
'serverca': '/etc/kojid/serverca.crt'}
if config.has_section('kojid'):
for name, value in config.items('kojid'):
if name in ['sleeptime', 'maxjobs', 'minspace']:
if name in ['sleeptime', 'maxjobs', 'minspace', 'retry_interval',
'max_retries', 'offline_retry_interval']:
try:
defaults[name] = int(value)
except ValueError:
@ -2712,8 +2717,11 @@ if __name__ == "__main__":
#build session options
session_opts = {}
for k in ('user','password','debug_xmlrpc', 'debug'):
session_opts[k] = getattr(options,k)
for k in ('user','password','debug_xmlrpc', 'debug',
'retry_interval', 'max_retries', 'offline_retry', 'offline_retry_interval'):
v = getattr(options, k, None)
if v is not None:
session_opts[k] = v
#start a session and login
session = koji.ClientSession(options.server, session_opts)
if os.path.isfile(options.cert):