extras-buildsys/www builders.psp, 1.4, 1.5 failed.psp, 1.1, 1.2 index.psp, 1.5, 1.6 indiv.psp, 1.4, 1.5 job.psp, 1.4, 1.5 success.psp, 1.1, 1.2
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Thu Aug 4 20:27:15 UTC 2005
Author: dcbw
Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26158/www
Modified Files:
builders.psp failed.psp index.psp indiv.psp job.psp
success.psp
Log Message:
2005-08-04 Dan Williams <dcbw at redhat.com>
* Attempts to reduce network bandwidth usage between client & server
- for listing jobs, 'status' item in the arg list is now a list itself
which is combined using OR.
- New 'orderby' arg for listing jobs
- Fixes for both of the above in the web interface, the client,
and the server
* Small fixes to the web interface to display 'result' as well as 'status'
Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- builders.psp 29 Jul 2005 06:55:56 -0000 1.4
+++ builders.psp 4 Aug 2005 20:27:12 -0000 1.5
@@ -13,7 +13,7 @@
import socket, xmlrpclib
args = {}
-args['status'] = 'building'
+args['status'] = ['building']
try:
(e, msg, jobs) = server.list_jobs(args)
(e, msg, builders) = server.list_builders()
Index: failed.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- failed.psp 4 Aug 2005 06:51:25 -0000 1.1
+++ failed.psp 4 Aug 2005 20:27:12 -0000 1.2
@@ -9,7 +9,10 @@
import socket, xmlrpclib
try:
args = {}
- args['status'] = 'failed'
+ # Don't show finished/failed jobs, just ones packagers
+ # haven't cleared yet.
+ args['status'] = ['failed']
+ args['result'] = 'failed'
args['maxrows'] = 100
(e, msg, these_jobs) = server.list_jobs(args)
except socket.error, e:
@@ -81,7 +84,7 @@
if i == 1:
%>
<tr>
- <td bgcolor="#efefef" colspan="5">No jobs found.</td>
+ <td bgcolor="#efefef" colspan="6">No jobs found.</td>
<tr>
<%
# endif
Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.psp 29 Jul 2005 05:25:23 -0000 1.5
+++ index.psp 4 Aug 2005 20:27:12 -0000 1.6
@@ -9,11 +9,10 @@
import socket, xmlrpclib
try:
args = {}
- args['status'] = 'waiting'
+ args['status'] = ['waiting', 'building']
args['maxrows'] = 30
- (e, msg, waiting_jobs) = server.list_jobs(args)
- args['status'] = 'building'
- (e, msg, building_jobs) = server.list_jobs(args)
+ args['orderby'] = ['status', 'uid']
+ (e, msg, jobs) = server.list_jobs(args)
except socket.error, e:
msg = str(e)
%>
@@ -50,36 +49,7 @@
<%
i = 1
- for job in building_jobs:
- top = ''
- if i == 1:
- top = '-top'
- col_mod = ''
- if int(i / 2.0) == (i / 2.0):
- col_mod = '-alt'
-
- source = job['source']
- if '/' in source:
- import os
- source = os.path.basename(source)
- # endif
-
- joblink = job_link(job['uid'])
- username = job['username'].replace('@', ' ')
-%>
- <tr>
- <td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=joblink%>"><%=job['uid']%></a></td>
- <td class="job<%=top%><%=col_mod%>"><%=job['package']%></td>
- <td class="job<%=top%><%=col_mod%>"><%=source%></td>
- <td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
- <td class="job<%=top%><%=col_mod%>"><%=job['target']%></td>
- <td class="job<%=top%><%=col_mod%>"><%=username%></td>
- <tr>
-<%
- i = i + 1
- # endfor
-
- for job in waiting_jobs:
+ for job in jobs:
top = ''
if i == 1:
top = '-top'
@@ -112,7 +82,7 @@
if i == 1:
%>
<tr>
- <td bgcolor="#efefef" colspan="5">No jobs found.</td>
+ <td bgcolor="#efefef" colspan="6">No jobs found.</td>
<tr>
<%
# endif
Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- indiv.psp 2 Aug 2005 04:10:33 -0000 1.4
+++ indiv.psp 4 Aug 2005 20:27:12 -0000 1.5
@@ -23,7 +23,10 @@
if form.has_key('status') and form['status']:
cur_status = str(form['status'])
if cur_status != 'ALL':
- args['status'] = cur_status
+ if cur_status == 'failed' or cur_status == 'success':
+ args['result'] = cur_status
+ else:
+ args['status'] = [cur_status]
cur_target = ''
if form.has_key('target') and form['target']:
cur_target = str(form['target'])
@@ -53,7 +56,7 @@
# default cutoff is 1 day
cutoff_time = 86400
- status_list = ['ALL', 'waiting', 'building', 'addtorepo', 'needsign', 'failed', 'finished']
+ status_list = ['ALL', 'waiting', 'building', 'add_to_repo', 'needsign', 'failed', 'success']
%>
<center>
@@ -143,7 +146,7 @@
<td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=joblink%>"><%=job['uid']%></a></td>
<td class="job<%=top%><%=col_mod%>"><%=job['package']%></td>
<td class="job<%=top%><%=col_mod%>"><%=source%></td>
- <td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
+ <td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font>/<font class="result-<%=job['result']%>"><%=job['result']%></font></td>
<td class="job<%=top%><%=col_mod%>"><%=job['target']%></td>
<tr>
<%
Index: job.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- job.psp 29 Jul 2005 05:27:16 -0000 1.4
+++ job.psp 4 Aug 2005 20:27:12 -0000 1.5
@@ -88,11 +88,9 @@
<td colspan="2" align="left">
<table class="archjobs" cellspacing="0" cellpadding="0">
<tr>
- <td width="3%" class="archjobs"></td>
- <td width="37%" class="archjobs">
- <font class="archjobtag"><%=aj['arch']%>:</font>
- <font class="archjob"> <%=aj['builder_addr']%></font>
- </td>
+ <td width="2%" class="archjobs"></td>
+ <td width="5%" class="archjobs" align="right"><font class="archjobtag"><%=aj['arch']%>:</font></td>
+ <td width="33%" class="archjobs" align="left"><font class="archjob"> <%=aj['builder_addr']%></font></td>
<td width="30%" class="archjobs">
<font class="archjobtag">Status:</font>
<font class="archjob"> <%=aj['status']%>/<%=aj['builder_status']%></font>
Index: success.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- success.psp 4 Aug 2005 06:51:25 -0000 1.1
+++ success.psp 4 Aug 2005 20:27:12 -0000 1.2
@@ -8,11 +8,13 @@
<%
import socket, xmlrpclib
try:
+ # show any jobs that have successfully built
args = {}
- args['status'] = 'needsign'
+ args['result'] = 'success'
args['maxrows'] = 100
(e, msg, some_jobs) = server.list_jobs(args)
- args['status'] = 'addtorepo'
+ args['status'] = ['add_to_repo']
+ args['maxrows'] = 100
(e, msg, other_jobs) = server.list_jobs(args)
these_jobs = other_jobs + some_jobs
except socket.error, e:
@@ -66,7 +68,7 @@
# endif
joblink = job_link(job['uid'])
- despam_user = job['username'].replace('@', ' ')
+ despam_user = job['username'].replace('@', ' ')
%>
<tr>
<td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=joblink%>"><%=job['uid']%></a></td>
@@ -84,7 +86,7 @@
if i == 1:
%>
<tr>
- <td bgcolor="#efefef" colspan="5">No jobs found.</td>
+ <td bgcolor="#efefef" colspan="6">No jobs found.</td>
<tr>
<%
# endif
More information about the fedora-extras-commits
mailing list