[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
rmccabe at sourceware.org
rmccabe at sourceware.org
Fri Nov 3 01:08:02 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-11-03 01:08:01
Modified files:
luci/site/luci/Extensions: cluster_adapters.py
Log message:
log a debug message when ricci connections fail for unknown reasons and fix a corner case when generating log urls
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.139&r2=1.140
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2006/11/02 20:58:48 1.139
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2006/11/03 01:08:01 1.140
@@ -2296,13 +2296,11 @@
try:
rc = RicciCommunicator(node[1].getId())
if not rc:
- continue
- except RicciError, e:
+ raise Exception, 'rc is None'
+ except Exception, e:
luci_log.debug('ricci error for host %s: %s' \
% (node[0], str(e)))
continue
- except:
- continue
if not rc.authed():
rc = None
@@ -2560,6 +2558,7 @@
except:
luci_log.debug_verbose('Unable to resolve node name %s/%s to retrieve daemon information' % (nodename, clustername))
nodename_resolved = nodename
+
try:
rc = RicciCommunicator(nodename_resolved)
if not rc:
@@ -2577,6 +2576,8 @@
dlist.append("rgmanager")
states = getDaemonStates(rc, dlist)
infohash['d_states'] = states
+ else:
+ nodename_resolved = nodename
infohash['logurl'] = '/luci/logs/?nodename=' + nodename_resolved + '&clustername=' + clustername
return infohash
@@ -4089,6 +4090,7 @@
#a flag already exists... try to delete it
try:
+ # hostname must be a FQDN
rc = RicciCommunicator(hostname)
except RicciError, e:
luci_log.info('Unable to connect to the ricci daemon: %s' % str(e))
More information about the Cluster-devel
mailing list