From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 25 Oct 2006 01:11:13 -0000 Subject: [Cluster-devel] conga/luci cluster/form-macros site/luci/Exten ... Message-ID: <20061025011113.28953.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: rmccabe at sourceware.org 2006-10-25 01:11:09 Modified files: luci/cluster : form-macros luci/site/luci/Extensions: cluster_adapters.py ricci_bridge.py Added files: luci/logs : Makefile index_html Log message: frontend support for log display fixes. the added index_html file (which is responsible for most of the diff) is a stripped down version of the one we display everywhere else, so there's really nothing new there. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.90&r2=1.91 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/logs/Makefile.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/logs/index_html.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.128&r2=1.129 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.33&r2=1.34 --- conga/luci/cluster/form-macros 2006/10/16 20:34:37 1.90 +++ conga/luci/cluster/form-macros 2006/10/25 01:11:08 1.91 @@ -1716,7 +1716,7 @@

Recent Log Activity for

- +
/cvs/cluster/conga/luci/logs/Makefile,v --> standard output revision 1.1 --- conga/luci/logs/Makefile +++ - 2006-10-25 01:11:13.257613000 +0000 @@ -0,0 +1,19 @@ +LUCI_HOST=luci +LUCI_USER=admin +LUCI_PASS=changeme +LUCI_FTP=$(LUCI_HOST):8021 +LUCI_HTTP=http://$(LUCI_HOST):8080/luci + +all: + @true + +# import page local page templates to the Luci server +import: + @if test "$(FILES)"; then \ + ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/logs/ $(FILES) ; \ + else \ + find . -follow -maxdepth 1 -type f -not -name "Makefile*" -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/logs/ ; \ + fi + +export: + @wget -q -r -nH --cut-dirs=2 "ftp://$(LUCI_USER):$(LUCI_PASS)@$(LUCI_FTP)/luci/logs/*" /cvs/cluster/conga/luci/logs/index_html,v --> standard output revision 1.1 --- conga/luci/logs/index_html +++ - 2006-10-25 01:11:13.340974000 +0000 @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + Get the global cache headers located in global_cache_settings. + + + + A slot where you can insert elements in the header from a template + + + + A slot where you can insert CSS in the header from a template + + + + + This is deprecated, please use style_slot instead. + + + + + A slot where you can insert javascript in the header from a template + + + + + + + + + +
+ +
+ + Log information for is being retrieved... + + +
+ +
+ +
+ + + --- conga/luci/site/luci/Extensions/cluster_adapters.py 2006/10/25 00:43:48 1.128 +++ conga/luci/site/luci/Extensions/cluster_adapters.py 2006/10/25 01:11:08 1.129 @@ -2398,7 +2398,7 @@ states = getDaemonStates(rc, dlist) infohash['d_states'] = states - infohash['logurl'] = baseurl + "?pagetype=" + NODE_LOGS + "&nodename=" + nodename + "&clustername=" + clustername + infohash['logurl'] = '/luci/logs/?nodename=' + nodename + '&clustername=' + clustername return infohash #get list of faildoms for node @@ -2434,7 +2434,7 @@ map['status'] = NODE_INACTIVE map['status_str'] = NODE_INACTIVE_STR - map['logurl'] = baseurl + "?pagetype=" + NODE_LOGS + "&nodename=" + name + "&clustername=" + clustername + map['logurl'] = '/luci/logs?nodename=' + name + '&clustername=' + clustername #set up URLs for dropdown menu... if map['status'] == NODE_ACTIVE: map['jl_url'] = baseurl + "?pagetype=" + NODE_PROCESS + "&task=" + NODE_LEAVE_CLUSTER + "&nodename=" + name + "&clustername=" + clustername --- conga/luci/site/luci/Extensions/ricci_bridge.py 2006/10/25 00:43:48 1.33 +++ conga/luci/site/luci/Extensions/ricci_bridge.py 2006/10/25 01:11:08 1.34 @@ -326,10 +326,8 @@ if log_domain: entry += log_domain if log_pid: - entry += '[' + log_pid + ']' + ': ' - else - entry += ': ' - entry += log_msg + '
' + entry += '[' + log_pid + ']' + entry += ': ' + log_msg + '
' return entry def nodeReboot(rc):