diff --git a/htroot/Banner.java b/htroot/Banner.java index 23b285b13..bd68197a4 100644 --- a/htroot/Banner.java +++ b/htroot/Banner.java @@ -77,18 +77,19 @@ public class Banner { height = post.getInt("heigth", height); } - String name = ""; - long links = 0; - long words = 0; - int myppm = 0; - double myqph = 0; - String type = ""; - String network = ""; - long nlinks = 0; - long nwords = 0; - double nqpm = 0; - double nqph = 0; - long nppm = 0; + String name = ""; + long links = 0; + long words = 0; + int myppm = 0; + double myqph = 0; + String type = ""; + String network = env.getConfig("network.unit.name", "unspecified").toUpperCase(); + int peers = yacyCore.seedDB.sizeConnected(); + long nlinks = yacyCore.seedDB.countActiveURL(); + long nwords = yacyCore.seedDB.countActiveRWI(); + double nqpm = yacyCore.seedDB.countActiveQPM(); + long nppm = yacyCore.seedDB.countActivePPM(); + double nqph = 0; yacySeed seed = yacyCore.seedDB.mySeed(); if (seed != null){ @@ -97,11 +98,6 @@ public class Banner { words = Long.parseLong(seed.get(yacySeed.ICOUNT, "0")); myppm = seed.getPPM(); myqph = 60d * seed.getQPM(); - network = env.getConfig("network.unit.name", "unspecified").toUpperCase(); - nlinks = yacyCore.seedDB.countActiveURL(); - nwords = yacyCore.seedDB.countActiveRWI(); - nqpm = yacyCore.seedDB.countActiveQPM(); - nppm = yacyCore.seedDB.countActivePPM(); if (yacyCore.seedDB.mySeed().isVirgin()) { type = "VIRGIN"; @@ -126,10 +122,10 @@ public class Banner { if (!plasmaGrafics.logoIsLoaded()) { BufferedImage logo = ImageIO.read(new File(IMAGE)); - return plasmaGrafics.getBannerPicture(1000, width, height, bgcolor, textcolor, bordercolor, name, links, words, type, myppm, network, nlinks, nwords, nqph, nppm, logo); + return plasmaGrafics.getBannerPicture(1000, width, height, bgcolor, textcolor, bordercolor, name, links, words, type, myppm, network, peers, nlinks, nwords, nqph, nppm, logo); } - return plasmaGrafics.getBannerPicture(1000, width, height, bgcolor, textcolor, bordercolor, name, links, words, type, myppm, network, nlinks, nwords, nqph, nppm); + return plasmaGrafics.getBannerPicture(1000, width, height, bgcolor, textcolor, bordercolor, name, links, words, type, myppm, network, peers, nlinks, nwords, nqph, nppm); } } diff --git a/htroot/Status.html b/htroot/Status.html index 21a2ae7db..19dfde887 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -8,6 +8,16 @@ #%env/templates/header.template%# #%env/templates/submenuConfig.template%# + + #(showPrivateTable)# +
+ +
+ :: + #(/showPrivateTable)# + @@ -132,63 +142,8 @@ -
- -
- Public System Properties -
-
System Version
-
#[versionpp]#
- -
This peer's address
-
#(peerAddress)# - Not assigned - :: - http://#[address]#
- http://#[peername]#.yacy - #(/peerAddress)#
- -
This peer's name
-
#[peerName]#/#[hash]#
- -
This peer's statistics
-
#(peerStatistics)# - Unknown - :: -
Uptime: #[uptime]#
-
Links/RWI: #[links]# / #[words]#
-
PPM/QPH: #[pagesperminute]# / #[queriesperhour]#
-
Connects: - #[juniorConnects]# | #[seniorConnects]# | #[principalConnects]# | #[disconnects]# (#[connects]# peers/hour) - #(/peerStatistics)# -
- -
This peer's status
-
#(peerStatus)# - Virgin - :: - Junior - :: - Senior - :: - Principal - #(/peerStatus)#
- -
Other peers
-
#(otherPeers)#not online::#[num]# other peers online.#(/otherPeers)#
- - #(showPrivateTable)# -
Log-In
-
Click here to log in as administrator and see full status.
- :: - #(/showPrivateTable)# - -
-
- -
- #%[privateStatusTable]%# + diff --git a/htroot/Status_p.inc b/htroot/Status_p.inc index 089d060c7..2948cf43d 100644 --- a/htroot/Status_p.inc +++ b/htroot/Status_p.inc @@ -1,8 +1,17 @@
- Private System Properties + System Status
+
Process
+
#[versionpp]# + #(peerStatistics)# + Unknown + :: +
Uptime: #[uptime]#
+ #(/peerStatistics)# +
+
System Resources
Processors: #[processors]#
@@ -13,8 +22,14 @@ password-protected #(/protection)# -
Peer Host
-
#[host]#:#[port]# #(extPortFormat)#::| (Binding to interface: #[extPort]#)#(/extPortFormat)# #(sslSupport)#::| SSL: enabled#(/sslSupport)#
+
Address
+
Host: #[host]#:#[port]# #(extPortFormat)#::| (Binding to interface: #[extPort]#)#(/extPortFormat)# #(sslSupport)#::| SSL: enabled#(/sslSupport)#
+ #(peerAddress)# + peer address not assigned + :: + Public Address: http://#[address]#
+ YaCy Address: http://#[peername]#.yacy + #(/peerAddress)#
#(portForwarding)#::
Port Forwarding Host
@@ -45,43 +60,40 @@
Incoming Connections
Active: #[connectionsActive]# | Idle: #[connectionsIdle]# | Max: #[connectionsMax]#
-
Indexing Queue
-
+
Queues
+
+ Indexing Queue: +
-
#[indexingQueueSize]# | #[indexingQueueMax]#
+
-
Loader Queue
-
+ Loader Queue: +
- - + + -
#[loaderQueueSize]# | #[loaderQueueMax]#
#[loaderQueueSize]# | #[loaderQueueMax]#
- -
Crawler Queues
-
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
Local Crawl#[localCrawlQueueSize]##(localCrawlPaused)#pause local crawl::continue local crawl#(/localCrawlPaused)##(localCrawlPaused)# ::(paused)#(/localCrawlPaused)#
Remote triggered Crawl#[remoteTriggeredCrawlQueueSize]##(remoteTriggeredCrawlPaused)#pause remote triggered crawl::continue remote triggered crawl#(/remoteTriggeredCrawlPaused)##(remoteTriggeredCrawlPaused)# ::(paused)#(/remoteTriggeredCrawlPaused)#
Pre-Queueing#[stackCrawlQueueSize]#
Local Crawl#[localCrawlQueueSize]##(localCrawlPaused)#pause local crawl::continue local crawl#(/localCrawlPaused)##(localCrawlPaused)# ::(paused)#(/localCrawlPaused)#
Remote triggered Crawl#[remoteTriggeredCrawlQueueSize]##(remoteTriggeredCrawlPaused)#pause remote triggered crawl::continue remote triggered crawl#(/remoteTriggeredCrawlPaused)##(remoteTriggeredCrawlPaused)# ::(paused)#(/remoteTriggeredCrawlPaused)#
Pre-Queueing#[stackCrawlQueueSize]#
diff --git a/htroot/env/base.css b/htroot/env/base.css index 6586463a7..3264aa02c 100644 --- a/htroot/env/base.css +++ b/htroot/env/base.css @@ -390,13 +390,13 @@ div.welcome { /* The heading in Status.html */ margin:10px 0; padding-top:130px; text-align:left; - width:44%; + width:55%; background:url(/env/grafics/kaskelix.png) top center no-repeat; } div.sidebar { /* sidebars on the right side */ float:left; - width:27%; + width:45%; margin:10px 0; padding-top:10px; text-align:left; diff --git a/source/de/anomic/plasma/plasmaGrafics.java b/source/de/anomic/plasma/plasmaGrafics.java index 96d5f4c2d..1433d6e26 100644 --- a/source/de/anomic/plasma/plasmaGrafics.java +++ b/source/de/anomic/plasma/plasmaGrafics.java @@ -357,23 +357,23 @@ public class plasmaGrafics { } //[MN] - public static ymageMatrix getBannerPicture(long maxAge, int width, int height, String bgcolor, String textcolor, String bordercolor, String name, long links, long words, String type, int ppm, String network, long nlinks, long nwords, double nqph, long nppm) { + public static ymageMatrix getBannerPicture(long maxAge, int width, int height, String bgcolor, String textcolor, String bordercolor, String name, long links, long words, String type, int ppm, String network, int peers, long nlinks, long nwords, double nqph, long nppm) { if ((bannerPicture == null) || ((System.currentTimeMillis() - bannerPictureDate) > maxAge)) { - drawBannerPicture(width, height, bgcolor, textcolor, bordercolor, name, links, words, type, ppm, network, nlinks, nwords, nqph, nppm, logo); + drawBannerPicture(width, height, bgcolor, textcolor, bordercolor, name, links, words, type, ppm, network, peers, nlinks, nwords, nqph, nppm, logo); } return bannerPicture; } //[MN] - public static ymageMatrix getBannerPicture(long maxAge, int width, int height, String bgcolor, String textcolor, String bordercolor, String name, long links, long words, String type, int ppm, String network, long nlinks, long nwords, double nqph, long nppm, BufferedImage newLogo) { + public static ymageMatrix getBannerPicture(long maxAge, int width, int height, String bgcolor, String textcolor, String bordercolor, String name, long links, long words, String type, int ppm, String network, int peers, long nlinks, long nwords, double nqph, long nppm, BufferedImage newLogo) { if ((bannerPicture == null) || ((System.currentTimeMillis() - bannerPictureDate) > maxAge)) { - drawBannerPicture(width, height, bgcolor, textcolor, bordercolor, name, links, words, type, ppm, network, nlinks, nwords, nqph, nppm, newLogo); + drawBannerPicture(width, height, bgcolor, textcolor, bordercolor, name, links, words, type, ppm, network, peers, nlinks, nwords, nqph, nppm, newLogo); } return bannerPicture; } //[MN] - private static void drawBannerPicture(int width, int height, String bgcolor, String textcolor, String bordercolor, String name, long links, long words, String type, int ppm, String network, long nlinks, long nwords, double nqph, long nppm, BufferedImage newLogo) { + private static void drawBannerPicture(int width, int height, String bgcolor, String textcolor, String bordercolor, String name, long links, long words, String type, int ppm, String network, int peers, long nlinks, long nwords, double nqph, long nppm, BufferedImage newLogo) { int exprlength = 19; logo = newLogo; @@ -387,7 +387,7 @@ public class plasmaGrafics { ymageToolPrint.print(bannerPicture, 100, 42, 0, "TYPE: " + addTrailingBlanks(type, exprlength), -1); ymageToolPrint.print(bannerPicture, 100, 52, 0, "SPEED: " + addTrailingBlanks(ppm + " PAGES/MINUTE", exprlength), -1); - ymageToolPrint.print(bannerPicture, 285, 12, 0, "NETWORK: " + addTrailingBlanks(network, exprlength), -1); + ymageToolPrint.print(bannerPicture, 285, 12, 0, "NETWORK: " + addTrailingBlanks(network + " [" + peers + "]", exprlength), -1); ymageToolPrint.print(bannerPicture, 285, 22, 0, "LINKS: " + addBlanksAndDots(nlinks, exprlength), -1); ymageToolPrint.print(bannerPicture, 285, 32, 0, "WORDS: " + addBlanksAndDots(nwords, exprlength), -1); ymageToolPrint.print(bannerPicture, 285, 42, 0, "QUERIES: " + addTrailingBlanks(nqph + " QUERIES/HOUR", exprlength), -1);