From ff34377ac53ddbc86cf6d81fc2e0d2c496e04b79 Mon Sep 17 00:00:00 2001
From: theli <theli@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Fri, 24 Feb 2006 08:58:13 +0000
Subject: [PATCH] *) displaying fill level of indexing and loader queue on
 status page

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1757 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/Status.java               |  20 ++++++++++++++------
 htroot/Status_p.inc              |  30 ++++++++++++++++++++++++++++--
 htroot/env/grafics/green_bar.gif | Bin 0 -> 807 bytes
 htroot/env/grafics/red_bar.gif   | Bin 0 -> 807 bytes
 4 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 htroot/env/grafics/green_bar.gif
 create mode 100644 htroot/env/grafics/red_bar.gif

diff --git a/htroot/Status.java b/htroot/Status.java
index ce1b84f50..a14d40fc3 100644
--- a/htroot/Status.java
+++ b/htroot/Status.java
@@ -286,12 +286,20 @@ public class Status {
         
         // Queue information
         final plasmaSwitchboard sb = (plasmaSwitchboard)env;
-        prop.put("indexingQueueSize", Integer.toString(sb.getThread("80_indexing").getJobCount()+sb.indexingTasksInProcess.size()));
-        prop.put("indexingQueueMax", Integer.toString(plasmaSwitchboard.indexingSlots));
-
-        prop.put("loaderQueueSize", Integer.toString(sb.cacheLoader.size()));        
-        prop.put("loaderQueueMax", Integer.toString(plasmaSwitchboard.crawlSlots));        
-
+        int indexingJobCount = sb.getThread("80_indexing").getJobCount()+sb.indexingTasksInProcess.size();
+        int indexingMaxCount = plasmaSwitchboard.indexingSlots;
+        int indexingPercent = indexingJobCount*100/indexingMaxCount;
+        prop.put("indexingQueueSize", Integer.toString(indexingJobCount));
+        prop.put("indexingQueueMax", Integer.toString(indexingMaxCount));
+        prop.put("indexingQueuePercent",(indexingPercent>100)?"100":Integer.toString(indexingPercent));
+        
+        int loaderJobCount = sb.cacheLoader.size();
+        int loaderMaxCount = plasmaSwitchboard.crawlSlots;
+        int loaderPercent = loaderJobCount*100/loaderMaxCount;
+        prop.put("loaderQueueSize", Integer.toString(loaderJobCount));        
+        prop.put("loaderQueueMax", Integer.toString(loaderMaxCount));        
+        prop.put("loaderQueuePercent", (loaderPercent>100)?"100":Integer.toString(loaderPercent));
+        
         prop.put("localCrawlQueueSize", Integer.toString(sb.getThread(plasmaSwitchboard.CRAWLJOB_LOCAL_CRAWL).getJobCount()));
         prop.put("localCrawlPaused",sb.crawlJobIsPaused(plasmaSwitchboard.CRAWLJOB_LOCAL_CRAWL)?1:0);
 
diff --git a/htroot/Status_p.inc b/htroot/Status_p.inc
index e8e74f3f5..df8ec2ba3 100644
--- a/htroot/Status_p.inc
+++ b/htroot/Status_p.inc
@@ -66,12 +66,38 @@
 </tr>
 <tr class="TableCellDark">
 	<td>Indexing Queue</td>
-	<td>#[indexingQueueSize]# | #[indexingQueueMax]#</td>
+	<td>
+		<table border="0" cellpadding="0" cellspacing="0" width="200" >
+		<tr>
+			<td width="70">#[indexingQueueSize]#&nbsp;|&nbsp;#[indexingQueueMax]#&nbsp;</td>
+			<td>
+				<table border="0" cellpadding="0" cellspacing="0" width="150" height="10" bgcolor="#FFFFFF" style="border-style:solid; border-width:1px; border-color:#CAD5E3">
+				<tr>
+					<td align="left"><img src="env/grafics/green_bar.gif" width="#[indexingQueuePercent]#%" height="10" alt=""></td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+		</table>	
+	</td>
 	<td>[<a href="IndexCreateIndexingQueue_p.html">Details</a>]</td>
 </tr>
 <tr class="TableCellLight">
 	<td>Loader Queue</td>
-	<td>#[loaderQueueSize]# | #[loaderQueueMax]# </td>
+	<td>		
+		<table border="0" cellpadding="0" cellspacing="0" width="200" >
+		<tr>
+			<td width="70">#[loaderQueueSize]#&nbsp;|&nbsp;#[loaderQueueMax]#&nbsp;</td>
+			<td>
+				<table border="0" cellpadding="0" cellspacing="0" width="150" height="10" bgcolor="#FFFFFF" style="border-style:solid; border-width:1px; border-color:#CAD5E3">
+				<tr>
+					<td align="left"><img src="env/grafics/green_bar.gif" width="#[loaderQueuePercent]#%" height="10" alt=""></td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+		</table>		 
+	</td>
 	<td>[<a href="IndexCreateLoaderQueue_p.html">Details</a>]</td>
 </tr>
 <tr class="TableCellDark">
diff --git a/htroot/env/grafics/green_bar.gif b/htroot/env/grafics/green_bar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e32422dd959c071d057e3c1e71b770ff6724f290
GIT binary patch
literal 807
zcma)5J!lkB5dQXV-Cga}CRin4afTQ)77=4{fz2I<o{EYDIdcgZjoo<>=DJ+@NUkx8
zR>BEqjO8`KLNr)g1Vpe<u@KD<f?~jki23I2ZoJZ2X5Re0Z)V<mn=j;!4^B96@DsTC
z1_|YySX<c(gtK$KpW@Z5dNy+GkP*N~y%kvdD*eXu(Y5B`@q;-z$M|1ThW3Z0hOF-M
zVdC5f+QHL1(@14ePtmc({g;;(rS`)^v(yrejo<dM_}N4DNn0|T^q+kzTgBHFw~x42
z(hHIudL;8?-LJJqh_xK|R@?7ed!@$*7y}DETaWq+dZYec(SF`;i01BL{D3w?syu9q
z_WOR<f?ZFtpXU5DGN)TI#&|ky)36*ZxezB%LJ_BMgx@FzXpNwNJmnd3H$n{KqV=h#
zWc3S_B^*VWdFRnjSwN16KFarvbVb-Za+5P;uzSbuR1WHJ9b~4e@DSkTVI!6A4XNHW
zGD;5O8SR;L<R_|*rATF5N0l8ZUBd)!VG=jUN+Hk8-SCL7<Rd-`t(Vd_pmnuAcn={n
zJmx0!PXk^wzX(45nNc498r@5cJ?guu(AK-q*QI(g$EABl`pNIUbs_=3;{tWo(*C3S
YNUHwd+Vjh`iG3>dpFrTkaa{~;1MdE(l>h($

literal 0
HcmV?d00001

diff --git a/htroot/env/grafics/red_bar.gif b/htroot/env/grafics/red_bar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..21fceb8912f3f482c62c7960a3871dfa60566345
GIT binary patch
literal 807
zcma)5O-NKx6#i!B_1?=}wUJf{EhbU>TNK%1gy+amT4;pG)F|}3o5tYG&RJe^HksHe
zm|#*{&PH5>it83a1T9orL|G9O2`Liwo%`OiS#}=h-1B$8bI!f@_2shX&y6LJz%Ssz
zTf~%2MB3URAb2#{{vle;mTMztPZ$9_RO-I9Z_#gD53QeF%srcwtBn64rD<<2RAuY1
z2NUIn&<QL)8AmdMN|KHp?jKp0m-0^+wR~MPHu~7Z{6`m=mkmj8(|_fi?DW5}xE;j3
zk(!lE_Y0XK>wc}(ORSZsxAGCs+G}kdz!+HQ)t9h8zdh{lHSMKFRW!GS@uS)dsrbAh
z+V94JS-W0jKeefGq%YUyCgZ7;O~XpKWCL749{sq4Q~ZW;hE^|f=%XAUA47m1T(ds)
z<gGqLna61qm^X+n${eyp^iX(eq&39em)o2njf4AkvvORAYa(;61Q$M5JB<{7RHZa+
zWSHznGukt0%8ykYOOXn=ixN9hx`Q!1#BJOsD+N3==c`M6B@fY2XuYJq0j;a`!Fvdp
z;W9U-e;Tk{`y_b(dqR2iTX-*J_NecsNL%khUzh6f9M@-zbdlG;HzNUiQGp6;Y5(DU
Y#8v-qZQFHhVuwooC*V6c={V^A3-9Eo!vFvP

literal 0
HcmV?d00001