*) Displaying statistic for incoming connections on status page *) Bugfix for Loop-Access Bug when trying to access the yacy page while yacy is configured as proxy See: http://www.yacy-forum.de/viewtopic.php?p=6826 *) Bugfix for Referer Bug See: http://www.yacy-forum.de/viewtopic.php?p=11098#11098 *) Adding reverse Name lookup for yacy-domain names (used by the connection tracking page) git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@916 6c8d7289-2bf4-0310-a012-ef5d649a1542pull/1/head
parent
6d93ecf947
commit
c8a35a0130
@ -0,0 +1,37 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<title>YaCy '#[clientname]#': Connection Tracking</title>
|
||||
#[metas]#
|
||||
</head>
|
||||
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
|
||||
#[header]#
|
||||
<p><h2>Connection Tracking</h2></p>
|
||||
<p><h3>Incoming Connections</h3></p>
|
||||
<p>Showing #[numActiveRunning]# active connections, #[numActivePending]# pending connections from a max. of #[numMax]# allowed incoming connections.<br>
|
||||
<table border="0" cellpadding="2" cellspacing="1">
|
||||
<tr class="TableHeader" valign="bottom">
|
||||
<td class="small">Protocol</td>
|
||||
<td class="small">Duration</td>
|
||||
<td class="small">Source IP[:Port]</td>
|
||||
<td class="small">Dest. IP[:Port]</td>
|
||||
<td class="small">Command</td>
|
||||
<td class="small">Used</td>
|
||||
</tr>
|
||||
#{list}#
|
||||
<tr class="TableCell#(dark)#Light::Dark::Summary#(/dark)#" title="#[sessionName]#">
|
||||
<td class="small">#[proto]#</td>
|
||||
<td class="small">#(ms)##[duration]#::#[duration]# ms#(/ms)#</td>
|
||||
<td class="small">#[source]#</td>
|
||||
<td class="small">#[dest]#</td>
|
||||
<td class="small">#(running)#Waiting for new request nr. # #[reqNr]#::#[command]##(/running)#</td>
|
||||
<td class="small">#[used]#</td>
|
||||
</tr>
|
||||
#{/list}#
|
||||
</table>
|
||||
</p>
|
||||
|
||||
#[footer]#
|
||||
|
||||
</body>
|
||||
</html>
|
@ -0,0 +1,167 @@
|
||||
//PerformaceQueues_p.java
|
||||
//-----------------------
|
||||
//part of YaCy
|
||||
//(C) by Michael Peter Christen; mc@anomic.de
|
||||
//first published on http://www.anomic.de
|
||||
//Frankfurt, Germany, 2004, 2005
|
||||
//last major change: 16.02.2005
|
||||
//
|
||||
//This program is free software; you can redistribute it and/or modify
|
||||
//it under the terms of the GNU General Public License as published by
|
||||
//the Free Software Foundation; either version 2 of the License, or
|
||||
//(at your option) any later version.
|
||||
//
|
||||
//This program is distributed in the hope that it will be useful,
|
||||
//but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
//GNU General Public License for more details.
|
||||
//
|
||||
//You should have received a copy of the GNU General Public License
|
||||
//along with this program; if not, write to the Free Software
|
||||
//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
//Using this software in any meaning (reading, learning, copying, compiling,
|
||||
//running) means that you agree that the Author(s) is (are) not responsible
|
||||
//for cost, loss of data or any harm that may be caused directly or indirectly
|
||||
//by usage of this softare or this documentation. The usage of this software
|
||||
//is on your own risk. The installation and usage (starting/running) of this
|
||||
//software may allow other people or application to access your computer and
|
||||
//any attached devices and is highly dependent on the configuration of the
|
||||
//software which must be done by the user of the software; the author(s) is
|
||||
//(are) also not responsible for proper configuration and usage of the
|
||||
//software, even if provoked by documentation provided together with
|
||||
//the software.
|
||||
//
|
||||
//Any changes to this file according to the GPL as documented in the file
|
||||
//gpl.txt aside this file in the shipment you received can be done to the
|
||||
//lines that follows this copyright notice here, but changes must not be
|
||||
//done inside the copyright notive above. A re-distribution must contain
|
||||
//the intact and unchanged copyright notice.
|
||||
//Contributions and changes to the program code must be marked as such.
|
||||
|
||||
//You must compile this file with
|
||||
//javac -classpath .:../classes Network.java
|
||||
//if the shell's current path is HTROOT
|
||||
|
||||
import java.net.InetAddress;
|
||||
import java.util.Properties;
|
||||
|
||||
import org.apache.commons.pool.impl.GenericObjectPool;
|
||||
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.http.httpd;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
import de.anomic.server.serverCore;
|
||||
import de.anomic.server.serverDate;
|
||||
import de.anomic.server.serverHandler;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.server.serverSwitch;
|
||||
import de.anomic.server.serverThread;
|
||||
import de.anomic.server.serverCore.Session;
|
||||
import de.anomic.yacy.yacyCore;
|
||||
import de.anomic.yacy.yacySeed;
|
||||
import de.anomic.yacy.yacySeedDB;
|
||||
|
||||
public class Connections_p {
|
||||
|
||||
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch sb) {
|
||||
// return variable that accumulates replacements
|
||||
plasmaSwitchboard switchboard = (plasmaSwitchboard) sb;
|
||||
serverObjects prop = new serverObjects();
|
||||
|
||||
String virtualHost = switchboard.getConfig("fileHost","localhost");
|
||||
|
||||
serverThread httpd = switchboard.getThread("10_httpd");
|
||||
ThreadGroup httpSessions = ((serverCore)httpd).getSessionThreadGroup();
|
||||
|
||||
GenericObjectPool.Config httpdPoolConfig = ((serverCore)httpd).getPoolConfig();
|
||||
|
||||
/* waiting for all threads to finish */
|
||||
int threadCount = httpSessions.activeCount();
|
||||
Thread[] threadList = new Thread[httpdPoolConfig.maxActive];
|
||||
threadCount = httpSessions.enumerate(threadList);
|
||||
|
||||
int idx = 0, numActiveRunning = 0, numActivePending = 0, numMax = ((serverCore)httpd).getMaxSessionCount();
|
||||
boolean dark = true;
|
||||
for ( int currentThreadIdx = 0; currentThreadIdx < threadCount; currentThreadIdx++ ) {
|
||||
Thread currentThread = threadList[currentThreadIdx];
|
||||
if ((currentThread != null) && (currentThread instanceof serverCore.Session) && (currentThread.isAlive())) {
|
||||
// getting the session object
|
||||
Session currentSession = ((Session)currentThread);
|
||||
|
||||
// getting the session runtime
|
||||
long sessionTime = currentSession.getTime();
|
||||
|
||||
// getting the request command line
|
||||
boolean blockingRequest = false;
|
||||
String commandLine = currentSession.getCommandLine();
|
||||
if (commandLine == null) blockingRequest = true;
|
||||
int commandCount = currentSession.getCommandCount();
|
||||
|
||||
// getting the source ip address and port
|
||||
InetAddress userAddress = currentSession.getUserAddress();
|
||||
int userPort = currentSession.getUserPort();
|
||||
if (userAddress == null) continue;
|
||||
|
||||
serverHandler cmdObj = currentSession.getCommandObj();
|
||||
if (cmdObj instanceof httpd) {
|
||||
|
||||
// getting the http command object
|
||||
httpd currentHttpd = (httpd)cmdObj;
|
||||
|
||||
// getting the connection properties of this session
|
||||
Properties conProp = (Properties) currentHttpd.getConProp().clone();
|
||||
|
||||
// getting the destination host
|
||||
String dest = conProp.getProperty(httpHeader.CONNECTION_PROP_HOST);
|
||||
if (dest==null)continue;
|
||||
if (dest.equals(virtualHost)) dest = yacyCore.seedDB.mySeed.getName() + ".yacy";
|
||||
|
||||
|
||||
|
||||
// determining if the source is a yacy host
|
||||
yacySeed seed = yacyCore.seedDB.lookupByIP(userAddress,true,true,true);
|
||||
if (seed != null) {
|
||||
if ((seed.hash == yacyCore.seedDB.mySeed.hash) &&
|
||||
(!seed.get("Port","").equals(Integer.toString(userPort)))) {
|
||||
seed = null;
|
||||
}
|
||||
}
|
||||
|
||||
prop.put("list_" + idx + "_dark", ((dark) ? 1 : 0) ); dark=!dark;
|
||||
prop.put("list_" + idx + "_sessionName",currentSession.getName());
|
||||
prop.put("list_" + idx + "_proto","http");
|
||||
if (sessionTime > 1000*60) {
|
||||
prop.put("list_" + idx + "_ms",0);
|
||||
prop.put("list_" + idx + "_ms_duration",serverDate.intervalToString(sessionTime));
|
||||
} else {
|
||||
prop.put("list_" + idx + "_ms",1);
|
||||
prop.put("list_" + idx + "_ms_duration",Long.toString(sessionTime));
|
||||
}
|
||||
prop.put("list_" + idx + "_source",(seed!=null)?seed.getName()+".yacy":userAddress.getHostAddress()+":"+userPort);
|
||||
prop.put("list_" + idx + "_dest",dest);
|
||||
if (blockingRequest) {
|
||||
prop.put("list_" + idx + "_running",0);
|
||||
prop.put("list_" + idx + "_running_reqNr",Integer.toString(commandCount+1));
|
||||
numActivePending++;
|
||||
} else {
|
||||
prop.put("list_" + idx + "_running",1);
|
||||
prop.put("list_" + idx + "_running_command",commandLine);
|
||||
numActiveRunning++;
|
||||
}
|
||||
prop.put("list_" + idx + "_used",Integer.toString(commandCount));
|
||||
|
||||
idx++;
|
||||
}
|
||||
}
|
||||
}
|
||||
prop.put("list",idx);
|
||||
|
||||
prop.put("numMax",Integer.toString(numMax));
|
||||
prop.put("numActiveRunning",Integer.toString(numActiveRunning));
|
||||
prop.put("numActivePending",Integer.toString(numActivePending));
|
||||
|
||||
// return rewrite values for templates
|
||||
return prop;
|
||||
}
|
||||
}
|
@ -1,38 +1,88 @@
|
||||
<table border="0" cellpadding="2" cellspacing="1" width="100%">
|
||||
<tr class="TableHeader"><td colspan="2"><b>Private System Properties</b></td></tr>
|
||||
<tr class="TableCellDark"><td width="150">Protection</td><td>
|
||||
#(protection)#
|
||||
<b>Your settings are _not_ protected!</b> Please go to the <a href="Settings_p.html#admin">settings</a> page <b>immediately</b> and set an administration password.
|
||||
::
|
||||
Your settings are protected by a password.
|
||||
#(/protection)#
|
||||
</td></tr>
|
||||
<tr class="TableCellLight"><td>Proxy host</td><td>#[host]#:#[port]#</td></tr>
|
||||
<tr class="TableCellDark"><td>Port forwarding host</td><td>#(portForwarding)#not used::#[host]#:#[port]# (#(status)#broken::connected#(/status)#)#(/portForwarding)#</td></tr>
|
||||
<tr class="TableCellLight"><td>Remote proxy</td><td>#(remoteProxy)#not used::#[host]#:#[port]##(/remoteProxy)#</td></tr>
|
||||
<tr class="TableCellDark"><td>Auto-popup on start-up</td><td>
|
||||
#(popup)#
|
||||
Disabled. To enable this again please use the <a href="Settings_p.html#SystemBehaviour">Settings</a> page
|
||||
::
|
||||
Enabled. To disable this please use the <a href="Settings_p.html#SystemBehaviour">Settings</a> page
|
||||
#(/popup)#
|
||||
</td></tr>
|
||||
<tr class="TableCellLight"><td>Memory Usage</td><td>
|
||||
<!--
|
||||
<form action="Status.html" method="get">free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]# | <input type="submit" name="gc" value="Do Garbage-Collect now"></form>
|
||||
-->
|
||||
free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]#
|
||||
</td></tr>
|
||||
<tr class="TableCellDark"><td>Traffic</td><td>
|
||||
Out: #[trafficIn]# | In: #[trafficOut]#
|
||||
</td></tr>
|
||||
<tr class="TableCellLight"><td>System Resources</td><td>
|
||||
Processors: #[processors]#
|
||||
</td></tr>
|
||||
<tr class="TableCellDark"><td>Indexing Queue</td><td>#[indexingQueueSize]# | #[indexingQueueMax]#</td></tr>
|
||||
<tr class="TableCellLight"><td>Loader Queue</td><td>#[loaderQueueSize]# | #[loaderQueueMax]# #(loaderPaused)#::(paused)#(/loaderPaused)#</td></tr>
|
||||
<tr class="TableCellDark"><td>Local Crawler Queue</td><td>Enqueued: #[localCrawlQueueSize]# | Pending: #[stackCrawlQueueSize]#</td></tr>
|
||||
<tr class="TableCellLight"><td>Remote Crawler Queue</td><td>#[remoteCrawlQueueSize]#</td></tr>
|
||||
<tr class="TableHeader">
|
||||
<td colspan="3"><b>Private System Properties</b></td>
|
||||
</tr>
|
||||
<tr class="TableCellLight">
|
||||
<td>System Resources</td>
|
||||
<td>Processors: #[processors]#</td>
|
||||
<td width="50"> </td>
|
||||
</tr>
|
||||
<tr class="TableCellDark">
|
||||
<td width="150">Protection</td>
|
||||
<td>
|
||||
#(protection)#
|
||||
<b>Your settings are _not_ protected!</b> Please go to the <a href="Settings_p.html#admin">settings</a> page <b>immediately</b> and set an administration password.
|
||||
::
|
||||
Your settings are protected by a password.
|
||||
#(/protection)#
|
||||
</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr class="TableCellLight">
|
||||
<td>Proxy host</td>
|
||||
<td>#[host]#:#[port]#</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr class="TableCellDark">
|
||||
<td>Port forwarding host</td>
|
||||
<td>#(portForwarding)#not used::#[host]#:#[port]# (#(status)#broken::connected#(/status)#)#(/portForwarding)#</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr class="TableCellLight">
|
||||
<td>Remote proxy</td>
|
||||
<td>#(remoteProxy)#not used::#[host]#:#[port]##(/remoteProxy)#</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr class="TableCellDark">
|
||||
<td>Auto-popup on start-up</td>
|
||||
<td>
|
||||
#(popup)#
|
||||
Disabled. To enable this again please use the <a href="Settings_p.html#SystemBehaviour">Settings</a> page
|
||||
::
|
||||
Enabled. To disable this please use the <a href="Settings_p.html#SystemBehaviour">Settings</a> page
|
||||
#(/popup)#
|
||||
</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr class="TableCellLight">
|
||||
<td>Memory Usage</td><td>
|
||||
<!--
|
||||
<form action="Status.html" method="get">free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]# | <input type="submit" name="gc" value="Do Garbage-Collect now"></form>
|
||||
-->
|
||||
free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]#
|
||||
</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr class="TableCellDark">
|
||||
<td>Traffic</td>
|
||||
<td>Out: #[trafficIn]# | In: #[trafficOut]#</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr class="TableCellLight">
|
||||
<td>Connections Incoming</td>
|
||||
<td>Active: #[connectionsActive]# | Idle: #[connectionsIdle]# | Max: #[connectionsMax]#</td>
|
||||
<td>[<a href="Connections_p.html">Details</a>]</td>
|
||||
</tr>
|
||||
<tr class="TableCellDark">
|
||||
<td>Indexing Queue</td>
|
||||
<td>#[indexingQueueSize]# | #[indexingQueueMax]#</td>
|
||||
<td>[<a href="IndexCreateIndexingQueue_p.html">Details</a>]</td>
|
||||
</tr>
|
||||
<tr class="TableCellLight">
|
||||
<td>Loader Queue</td>
|
||||
<td>#[loaderQueueSize]# | #[loaderQueueMax]# #(loaderPaused)#::(paused)#(/loaderPaused)#</td>
|
||||
<td>[<a href="IndexCreateLoaderQueue_p.html">Details</a>]</td>
|
||||
</tr>
|
||||
<tr class="TableCellDark">
|
||||
<td>Local Crawler Queue</td>
|
||||
<td>Enqueued: #[localCrawlQueueSize]# | Pending: #[stackCrawlQueueSize]#</td>
|
||||
<td>[<a href="IndexCreateWWWLocalQueue_p.html">Details</a>]</td>
|
||||
</tr>
|
||||
<tr class="TableCellLight">
|
||||
<td>Remote Crawler Queue</td>
|
||||
<td>#[remoteCrawlQueueSize]#</td>
|
||||
<td>[<a href="IndexCreateWWWGlobalQueue_p.html">Details</a>]</td>
|
||||
</tr>
|
||||
|
||||
|
||||
</table>
|
Loading…
Reference in new issue