[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...

[jparsons@sourceware.org <jparsons@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-08-13 17:15:28

Modified files:
	luci/site/luci/Extensions: cluster_adapters.py 
	                           conga_constants.py ricci_bridge.py 

Log message:
	logging link

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.47&r2=1.48
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/conga_constants.py.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.15&r2=1.16

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/08/13 15:02:14	1.47
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/08/13 16:15:28	1.48
@@ -1534,7 +1534,8 @@
     dlist.append("rgmanager")
     states = rb.getDaemonStates(dlist)
     infohash['d_states'] = states
-                                                                                
+    
+  infohash['logurl'] = baseurl + "?pagetype=" + NODE_LOGS + "&nodename=" + nodename + "&clustername=" + clustername                                                                            
   return infohash
   #get list of faildoms for node  
 
@@ -1611,6 +1612,20 @@
 
   return resultlist
 
+def getLogsForNode(self, request):
+  nodename = request['nodename']
+  clustername = request['clustername']
+  nodename_resolved = resolve_nodename(clustername, nodename)
+  #rb = ricci_bridge(nodename_resolved)
+  #return rb.getNodeLogs()
+
+  str_buf = ""
+  file = open("./conga_constants.py", 'r')
+  lines = file.readlines()
+  for line in lines:
+  str_buf = str_buf + line + "<br/>"
+  return str_buf
+
 def isClusterBusy(self, req):
   items = None
   map = {}
--- conga/luci/site/luci/Extensions/conga_constants.py	2006/08/13 14:02:46	1.9
+++ conga/luci/site/luci/Extensions/conga_constants.py	2006/08/13 16:15:28	1.10
@@ -12,6 +12,7 @@
 NODE_CONFIG="14"
 NODE_ADD="15"
 NODE_PROCESS="16"
+NODE_LOGS="17"
 SERVICES="20"
 SERVICE_ADD="21"
 SERVICE_LIST="22"
--- conga/luci/site/luci/Extensions/ricci_bridge.py	2006/08/12 17:59:40	1.15
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2006/08/13 16:15:28	1.16
@@ -580,6 +580,11 @@
 
     return (batch_number, result)
 
+  def getNodeLogs(self):
+    QUERY_STR = '<?xml version="1.0" ?><ricci async="false" function="process_batch" version="1.0"><batch><module name=logging'
+
+    pass
+
 def createClusterBatch(cluster_name, cluster_alias, nodeList, services, shared_storage, LVS):
     batch = '<?xml version="1.0" ?>'
     batch += '<batch>'