*) SOAP: new function to get the Performance Settings of Queues and Processes

No items left in the yadmin SOAP-TODO :-)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3776 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/PerformanceQueues_p.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<PerfmanceQueues>
+	<Tasks>#{table}#
+		<Task>
+			<name><![CDATA[#(hasurl)##[shortdescr]#::#[shortdescr]##(/hasurl)#]]></name>
+	        <queueSize>#[queuesize]#</queueSize>
+	        <blocktime>#[blocktime]#</blocktime>
+	        <blockpercent>#[blockpercent]#</blockpercent>
+	        <sleeptime>#[sleeptime]#</sleeptime>
+	        <sleeppercent>#[sleeppercent]#</sleeppercent>
+	        <exectime>#[exectime]#</exectime>
+	        <execpercent>#[execpercent]#</execpercent>
+	        <totalcycles>#[totalcycles]#</totalcycles>
+	        <idlecycles>#[idlecycles]#</idlecycles>
+	        <busycycles>#[busycycles]#</busycycles>
+	        <memscycles>#[memscycles]#</memscycles>
+	        <sleeppercycle>#[sleeppercycle]#</sleeppercycle>
+	        <execpercycle>#[execpercycle]#</execpercycle>
+	        <memusepercycle>#[memusepercycle]#</memusepercycle>
+	        <delayIdleLoop>#[idlesleep]#"</delayIdleLoop>
+	        <delayBusyLoop>#[busysleep]#</delayBusyLoop>
+	        <minMemory>#[memprereq]#</minMemory>
+	        <description><![CDATA[#[longdescr]##(recommendation)#::<br/>recommended: #[value]##(/recommendation)#]]></description>
+        </Task>
+	#{/table}#</Tasks>
+	<Cache>
+		<dhtOut>
+			<urlCacheSize>#[urlCacheSize]#</urlCacheSize>
+			<wordCacheSize>#[wordCacheWSize]#</wordCacheSize>
+			<maxURLinCache>#[maxURLinWCache]#</maxURLinCache>
+			<maxAgeOfCache>#[maxAgeOfWCache]#</maxAgeOfCache>
+			<minAgeOfCache>#[minAgeOfWCache]#</minAgeOfCache>
+			<wordCacheMaxCount>#[wordOutCacheMaxCount]#</wordCacheMaxCount>
+			<wordCacheInitCount>#[wordCacheInitCount]#</wordCacheInitCount>
+			<wordFlushSize>#[wordFlushSize]#</wordFlushSize>
+		</dhtOut>
+		<dhtIn>
+			<urlCacheSize>#[urlCacheSize]#</urlCacheSize>
+			<wordCacheSize>#[wordCacheKSize]#</wordCacheSize>
+			<maxURLinCache>#[maxURLinKCache]#</maxURLinCache>
+			<maxAgeOfCache>#[maxAgeOfKCache]#</maxAgeOfCache>
+			<minAgeOfCache>#[minAgeOfKCache]#</minAgeOfCache>
+			<wordCacheMaxCount>#[wordInCacheMaxCount]#</wordCacheMaxCount>
+			<wordCacheInitCount>#[wordCacheInitCount]#</wordCacheInitCount>
+			<wordFlushSize>#[wordFlushSize]#</wordFlushSize>
+		</dhtIn>
+	</Cache>
+	<ThreadPools>
+		#{pool}#<Pool>
+			<Name><![CDATA[#[name]#]]></Name>
+			<maxActive>#[maxActive]#</maxActive>
+			<maxIdle>#[maxIdle]#</maxIdle>
+			<minIdle>#[minIdle]#</minIdle>
+			<numActive>#[numActive]#</numActive>
+			<numIdle>#[numIdle]#</numIdle>
+		</Pool>#{/pool}#
+	</ThreadPools>
+</PerfmanceQueues>

source/de/anomic/soap/services/AdminService.java

@@ -131,7 +131,8 @@ public class AdminService extends AbstractService {
 	 * ===================================================================== */
     private static final String TEMPLATE_CONFIG_XML = "xml/config_p.xml";   
     private static final String TEMPLATE_VERSION_XML = "xml/version.xml";
-    private static final String TEMPLATE_PROFILE_XML = "ViewProfile.xml";    
+    private static final String TEMPLATE_PROFILE_XML = "ViewProfile.xml";   
+    private static final String TEMPLATE_PERFORMANCE_QUEUES = "PerformanceQueues_p.xml";
     
     /**
      * This function can be used to set a configuration option
@@ -277,6 +278,17 @@ public class AdminService extends AbstractService {
         return this.convertContentToXML(result);        
     }        
     
+    public Document getPerformanceQueues() throws Exception {
+        // extracting the message context
+        extractMessageContext(AUTHENTICATION_NEEDED);          	
+        
+        // generating the template containing the network status information
+        byte[] result = this.serverContext.writeTemplate(TEMPLATE_PERFORMANCE_QUEUES, new serverObjects(), this.requestHeader);
+        
+        // sending back the result to the client
+        return this.convertContentToXML(result);        
+    }     
+    
     /**
      * This function can be used to configure the peer name
      * @param newName the new name of the peer

source/de/anomic/soap/services/admin.wsdl

@@ -44,141 +44,151 @@ Built on Apr 22, 2006 (06:55:48 PDT)--><wsdl:types><schema targetNamespace="http
   </wsdl:message>
   <wsdl:message name="setDistributedCrawlingResponse">
   </wsdl:message>
+  <wsdl:message name="getPerformanceQueuesResponse">
+    <wsdl:part name="getPerformanceQueuesReturn" type="apachesoap:Document"/>
+  </wsdl:message>
   <wsdl:message name="getTransferPropertiesRequest">
   </wsdl:message>
+
   <wsdl:message name="shutdownPeerResponse">
   </wsdl:message>
   <wsdl:message name="setPeerNameResponse">
-
   </wsdl:message>
   <wsdl:message name="setLocalPeerProfileRequest">
     <wsdl:part name="name" type="xsd:string"/>
     <wsdl:part name="nickname" type="xsd:string"/>
     <wsdl:part name="homepage" type="xsd:string"/>
     <wsdl:part name="email" type="xsd:string"/>
+
     <wsdl:part name="icq" type="xsd:string"/>
     <wsdl:part name="jabber" type="xsd:string"/>
     <wsdl:part name="yahoo" type="xsd:string"/>
-
     <wsdl:part name="msn" type="xsd:string"/>
     <wsdl:part name="comments" type="xsd:string"/>
   </wsdl:message>
   <wsdl:message name="getConfigPropertyResponse">
     <wsdl:part name="getConfigPropertyReturn" type="xsd:string"/>
   </wsdl:message>
+
   <wsdl:message name="createNewXMLDocumentResponse">
     <wsdl:part name="createNewXMLDocumentReturn" type="apachesoap:Document"/>
   </wsdl:message>
-
   <wsdl:message name="getMessageForwardingResponse">
     <wsdl:part name="getMessageForwardingReturn" type="apachesoap:Document"/>
   </wsdl:message>
   <wsdl:message name="getConfigPropertyListResponse">
     <wsdl:part name="getConfigPropertyListReturn" type="apachesoap:Document"/>
   </wsdl:message>
+
   <wsdl:message name="setMessageForwardingRequest">
     <wsdl:part name="enableForwarding" type="xsd:boolean"/>
     <wsdl:part name="forwardingCommand" type="xsd:string"/>
-
     <wsdl:part name="forwardingTo" type="xsd:string"/>
   </wsdl:message>
   <wsdl:message name="getVersionRequest">
   </wsdl:message>
   <wsdl:message name="setPeerPortRequest">
     <wsdl:part name="newPort" type="xsd:int"/>
+
   </wsdl:message>
   <wsdl:message name="enableRemoteProxyRequest">
     <wsdl:part name="enableProxy" type="xsd:boolean"/>
-
   </wsdl:message>
   <wsdl:message name="doGarbageCollectionResponse">
   </wsdl:message>
   <wsdl:message name="doGarbageCollectionRequest">
   </wsdl:message>
   <wsdl:message name="getServerLogRequest">
+
     <wsdl:part name="sequenceNumber" type="xsd:long"/>
   </wsdl:message>
   <wsdl:message name="getConfigPropertiesRequest">
-
     <wsdl:part name="keys" type="intf:ArrayOf_xsd_string"/>
   </wsdl:message>
   <wsdl:message name="setMessageForwardingResponse">
   </wsdl:message>
   <wsdl:message name="getVersionResponse">
     <wsdl:part name="getVersionReturn" type="apachesoap:Document"/>
+
   </wsdl:message>
   <wsdl:message name="setPeerNameRequest">
     <wsdl:part name="newName" type="xsd:string"/>
-
   </wsdl:message>
   <wsdl:message name="createNewXMLDocumentRequest">
     <wsdl:part name="rootElementName" type="xsd:string"/>
   </wsdl:message>
   <wsdl:message name="getMessageForwardingRequest">
   </wsdl:message>
+
   <wsdl:message name="getPeerProfileRequest">
     <wsdl:part name="peerhash" type="xsd:string"/>
   </wsdl:message>
-
   <wsdl:message name="setLocalPeerProfileResponse">
   </wsdl:message>
   <wsdl:message name="setPropertiesRequest">
     <wsdl:part name="keys" type="intf:ArrayOf_xsd_string"/>
     <wsdl:part name="values" type="intf:ArrayOf_xsd_string"/>
   </wsdl:message>
+
   <wsdl:message name="setConfigPropertyResponse">
   </wsdl:message>
   <wsdl:message name="setPropertiesResponse">
-
   </wsdl:message>
   <wsdl:message name="setConfigPropertyRequest">
     <wsdl:part name="key" type="xsd:string"/>
     <wsdl:part name="value" type="xsd:string"/>
   </wsdl:message>
   <wsdl:message name="shutdownPeerRequest">
+
   </wsdl:message>
   <wsdl:message name="getTransferPropertiesResponse">
     <wsdl:part name="getTransferPropertiesReturn" type="apachesoap:Document"/>
-
   </wsdl:message>
   <wsdl:message name="getPeerProfileResponse">
     <wsdl:part name="getPeerProfileReturn" type="apachesoap:Document"/>
   </wsdl:message>
   <wsdl:message name="getLocalPeerProfileResponse">
     <wsdl:part name="getLocalPeerProfileReturn" type="apachesoap:Document"/>
+
+  </wsdl:message>
+  <wsdl:message name="getPerformanceQueuesRequest">
   </wsdl:message>
   <wsdl:message name="setDistributedCrawlingRequest">
     <wsdl:part name="enableRemoteTriggeredCrawls" type="xsd:boolean"/>
-
     <wsdl:part name="maximumAllowedPPM" type="xsd:int"/>
   </wsdl:message>
   <wsdl:portType name="AdminService">
     <wsdl:operation name="setConfigProperty" parameterOrder="key value">
+
       <wsdl:input message="intf:setConfigPropertyRequest" name="setConfigPropertyRequest"/>
       <wsdl:output message="intf:setConfigPropertyResponse" name="setConfigPropertyResponse"/>
     </wsdl:operation>
     <wsdl:operation name="setProperties" parameterOrder="keys values">
       <wsdl:input message="intf:setPropertiesRequest" name="setPropertiesRequest"/>
-
       <wsdl:output message="intf:setPropertiesResponse" name="setPropertiesResponse"/>
     </wsdl:operation>
     <wsdl:operation name="getConfigProperty" parameterOrder="key">
       <wsdl:input message="intf:getConfigPropertyRequest" name="getConfigPropertyRequest"/>
+
       <wsdl:output message="intf:getConfigPropertyResponse" name="getConfigPropertyResponse"/>
     </wsdl:operation>
     <wsdl:operation name="getConfigProperties" parameterOrder="keys">
       <wsdl:input message="intf:getConfigPropertiesRequest" name="getConfigPropertiesRequest"/>
       <wsdl:output message="intf:getConfigPropertiesResponse" name="getConfigPropertiesResponse"/>
-
     </wsdl:operation>
     <wsdl:operation name="getConfigPropertyList">
       <wsdl:input message="intf:getConfigPropertyListRequest" name="getConfigPropertyListRequest"/>
       <wsdl:output message="intf:getConfigPropertyListResponse" name="getConfigPropertyListResponse"/>
+
     </wsdl:operation>
     <wsdl:operation name="getVersion">
       <wsdl:input message="intf:getVersionRequest" name="getVersionRequest"/>
       <wsdl:output message="intf:getVersionResponse" name="getVersionResponse"/>
     </wsdl:operation>
+    <wsdl:operation name="getPerformanceQueues">
+      <wsdl:input message="intf:getPerformanceQueuesRequest" name="getPerformanceQueuesRequest"/>
+      <wsdl:output message="intf:getPerformanceQueuesResponse" name="getPerformanceQueuesResponse"/>
+    </wsdl:operation>
 
     <wsdl:operation name="setPeerName" parameterOrder="newName">
       <wsdl:input message="intf:setPeerNameRequest" name="setPeerNameRequest"/>
@@ -314,6 +324,16 @@ Built on Apr 22, 2006 (06:55:48 PDT)--><wsdl:types><schema targetNamespace="http
         <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://yacy:8080/soap/admin" use="encoded"/>
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="getPerformanceQueues">
+      <wsdlsoap:operation soapAction=""/>
+      <wsdl:input name="getPerformanceQueuesRequest">
+        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://services.soap.anomic.de" use="encoded"/>
+      </wsdl:input>
+
+      <wsdl:output name="getPerformanceQueuesResponse">
+        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://yacy:8080/soap/admin" use="encoded"/>
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="setPeerName">
       <wsdlsoap:operation soapAction=""/>
       <wsdl:input name="setPeerNameRequest">