diff --git a/htroot/Status.html b/htroot/Status.html index 744ba4761..b00222c46 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -25,23 +25,11 @@

- - - + - - - - + - - - + - - - - -
System Properties
Protection -#(protection)# -Your settings are _not_ protected! Please go to the settings page immediately and set an administration password. -:: -Your settings are protected by a password. -#(/protection)# -
System version +
Public System Properties
System version #[versionpp]# #(versioncomment)#:: - the latest public version is #[latestVersion]#. Click here to download it.#(/versioncomment)#
This peer's address +
This peer's address #(peerAddress)# Not assigned :: @@ -54,8 +42,8 @@ see the installatio #[address]# ; Your '.yacy' home at http://www.#[peername]#.yacy #(/peerAddress)#
This peer's name#[peerName]#/#[hash]#
This peer's statistics +
This peer's name#[peerName]#/#[hash]#
This peer's statistics #(peerStatistics)# Unknown :: @@ -63,7 +51,7 @@ Uptime = #[uptime]#, Links# = #[links]#, RWIs# = #[words]#, PPM = #[pagesperminu Connects (#[juniorConnects]#|#[seniorConnects]#|#[principalConnects]#|#[disconnects]#) #[connects]# peers/hour #(/peerStatistics)#
This peer's status +
This peer's status #(peerStatus)# Virgin - You have not published your peer yet, because you have not used the proxy yet. If you configured your browser's proxy settings (see online: configure your browser's proxy settings), you must first load any page through the proxy to prove that this works. With this status you are not allowed to search other peers! :: @@ -75,8 +63,8 @@ Principal - You are senior and you publish your seed-list to a public accessible You can of course search the internet using the other peers' global index on your own search page. #(/peerStatus)#
Other peers#(otherPeers)#not online::#[num]# other peers online.#(/otherPeers)#
Seed server +
Other peers#(otherPeers)#not online::#[num]# other peers online.#(/otherPeers)#
Seed server #(seedServer)# Disabled. To enable this you need a FTP account where you can upload files to a web space. If you do that, you become a YaCy root server. You can configure your account details on the Settings page. :: @@ -87,13 +75,6 @@ Enabled: Updating periodically to file #[seedFile]#. Last upload: #[lastUpload]# ago. #(/seedServer)#
Auto-popup on start-up -#(popup)# -Disabled. To enable this again please use the Settings page -:: -Enabled. To disable this please use the Settings page -#(/popup)# -
Online-mode #(omode)# @@ -110,22 +91,10 @@ To start permanent mode, press this button: You are in permanent mode. Attention: If you don't have a flatrate or are always-on, you must switch off the proxy to go off-line. #(/omode)#
Memory Usage - -free: #[freeMemory]# | total: #[totalMemory]# | max: #[maxMemory]# -
Traffic -Out: #[trafficIn]# | In: #[trafficOut]# -
System Resources -Processors: #[processors]# -

+#%[privateStatusTable]%# #[footer]# diff --git a/htroot/Status.java b/htroot/Status.java index 0cb021809..39a71b676 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -53,6 +53,7 @@ import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.serverDate; +import de.anomic.server.serverThread; import de.anomic.yacy.yacyCore; import de.anomic.plasma.plasmaSwitchboard; @@ -73,6 +74,12 @@ public class Status { // update seed info yacyCore.peerActions.updateMySeed(); + if (header.get("IS_ADMIN","false").equals("true")) { + prop.put("privateStatusTable","Status_p.inc"); + } else { + prop.put("privateStatusTable",""); + } + // password protection if (env.getConfig("adminAccountBase64MD5", "").length() == 0) prop.put("protection", 0);//not protected @@ -92,23 +99,23 @@ public class Status { prop.put("versioncomment_latestVersion", Float.toString(yacyCore.latestVersion)); - //prop.put("host", serverCore.publicLocalIP()); - //prop.put("port", env.getConfig("port", "")); + prop.put("host", serverCore.publicLocalIP()); + prop.put("port", env.getConfig("port", "")); // port forwarding: hostname and port if ((serverCore.portForwardingEnabled) && (serverCore.portForwarding != null)) { prop.put("portForwarding", 1); - //prop.put("portForwarding_host", serverCore.portForwarding.getHost()); - //prop.put("portForwarding_port", Integer.toString(serverCore.portForwarding.getPort())); - //prop.put("portForwarding_status", serverCore.portForwarding.isConnected() ? 1:0); + prop.put("portForwarding_host", serverCore.portForwarding.getHost()); + prop.put("portForwarding_port", Integer.toString(serverCore.portForwarding.getPort())); + prop.put("portForwarding_status", serverCore.portForwarding.isConnected() ? 1:0); } else { prop.put("portForwarding", 0); } if (env.getConfig("remoteProxyUse", "false").equals("true")) { prop.put("remoteProxy", 1); - //prop.put("remoteProxy_host", env.getConfig("remoteProxyHost", "")); - //prop.put("remoteProxy_port", env.getConfig("remoteProxyPort", "")); + prop.put("remoteProxy_host", env.getConfig("remoteProxyHost", "")); + prop.put("remoteProxy_port", env.getConfig("remoteProxyPort", "")); } else { prop.put("remoteProxy", 0);//not used } @@ -220,6 +227,18 @@ public class Status { prop.put("trafficIn",bytesToString(httpdByteCountInputStream.getGlobalCount())); prop.put("trafficOut",bytesToString(httpdByteCountOutputStream.getGlobalCount())); + // Queue information + plasmaSwitchboard switchboard = (plasmaSwitchboard)env; + prop.put("indexingQueueSize", Integer.toString(switchboard.getThread("80_indexing").getJobCount())); + prop.put("indexingQueueMax", Integer.toString(plasmaSwitchboard.indexingSlots)); + + prop.put("loaderQueueSize", Integer.toString(switchboard.cacheLoader.size())); + prop.put("loaderQueueMax", Integer.toString(plasmaSwitchboard.crawlSlots)); + prop.put("loaderPaused",switchboard.crawlingIsPaused()?1:0); + + prop.put("localCrawlQueueSize", Integer.toString(switchboard.getThread("50_localcrawl").getJobCount())); + prop.put("remoteCrawlQueueSize", Integer.toString(switchboard.getThread("61_globalcrawltrigger").getJobCount())); + // return rewrite properties return prop; }