*) setting logging level for thread pools to info

*) new layout for bookmark list (Allo: please take a look if it's acceptable for you) *) crawlReceipt.java: displaying peer name in logging message *) Network.html: adding button for manual peer ping git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1584 6c8d7289-2bf4-0310-a012-ef5d649a1542
19 years ago · d0f76fc9bc
parent 5a38bf7017
commit d0f76fc9bc
5 changed files with 87 additions and 33 deletions
--- a/htroot/Bookmarks_p.html
+++ b/htroot/Bookmarks_p.html
@ -9,37 +9,66 @@
 <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
 #%env/templates/header.template%#
 <br><br>
-<h2>Bookmarks</h2>
+<h2>Bookmarks</h2></p>
 <!-- todo: div layout? -->
-<table border="1" width="100%" height="100%">
-<tr><td colspan="2">
-#(edit)#<h3>Add Bookmark</h3>::<h3>Edit Bookmark</h3>#(/edit)#
+
 <form action="Bookmarks_p.html" method="GET">
-Url: <input type="text" name="url" value="#[url]#" onblur="loadTitle()"><br />
-Title: <input type="text" name="title" value="#[title]#"><br />
-Description: <input type="text" name="description" value="#[description]#"><br />
-Tags (comma separated): <input type="text" name="tags" value="#[tags]#"><br />
-Public: <select name="public">
+<table border="0" width="100%" height="100%">
+	<tr>
+		<td colspan="2">#(edit)#<h3>Add Bookmark</h3>::<h3>Edit Bookmark</h3>#(/edit)#</td>
+	</tr>
+	<tr>
+		<td>Url:</td>
+		<td width="100%"><input type="text" name="url" value="#[url]#" onblur="loadTitle()" size="80"></td>
+	</tr>
+	<tr>
+		<td>Title:</td>
+		<td><input type="text" name="title" value="#[title]#" size="80"></td>
+	</tr>
+	<tr>
+		<td>Description:</td>
+		<td><input type="text" name="description" value="#[description]#" size="80"></td>
+	</tr>
+	<tr>
+		<td><nobr>Tags (comma separated):</nobr></td>
+		<td><input type="text" name="tags" value="#[tags]#" size="80"></td>
+	</tr>
+	<tr>
+		<td>Public:</td>
+		<td><select name="public">
 			<option value="public" #(public)#::selected#(/public)#>yes</option>
 			<option value="private" #(public)#selected::#(/public)#>no</option>
 			</select>
+		</td>
+	<tr>
+		<td colspan="1">
 		#(edit)#
 		<input type="submit" name="add" value="create">
 		::
 		<input type="submit" name="add" value="edit">
 		#(/edit)#
+		</td>
+	</tr>
+</table>
 </form>
-</td></tr>
-<tr height="100%">
+<hr>
+
+<table width="100%" height="100%">
+	<tr>
+		<td style="padding-bottom: 10px;"><h3>Bookmark List</h3></td>
+		<td><h3>Tags</h3></td>
+	</tr>
+<tr>
 	<td width="100%">
 #{bookmarks}#
+<p style="border-bottom:1px #000 dashed; padding-bottom: 1em;">
 #(public)#<img src="env/grafics/bookmarkpriv.gif" width="16" height="16" alt="private">::<img src="env/grafics/bookmarkpub.gif" width="16" height="16" alt="public">#(/public)#
-<a href="#[link]#" target="_blank">#[title]#</a><br />
-#[description]#<br />
-Tagged with <span class="bookmarkTags">#{tags}#<a href="Bookmarks_p.html?tag=#[tag]#">#[tag]#</a> #{/tags}#</span><br />
-<a href="Bookmarks_p.html?edit=#[hash]#">Edit</a> /
-<a href="Bookmarks_p.html?delete=#[hash]#">Delete</a>
-<p />
+<a href="#[link]#" target="_blank" class="bookmarkTitle">#[title]#</a><br />
+<span class="bookmarkDescription">#[description]#</span><br />
+Tagged with |&nbsp;#{tags}#<a href="Bookmarks_p.html?tag=#[tag]#" class="bookmarkTags">#[tag]#</a> | #{/tags}#<br />
+<a href="Bookmarks_p.html?edit=#[hash]#" class="bookmarkAction">Edit</a> /
+<a href="Bookmarks_p.html?delete=#[hash]#" class="bookmarkAction">Delete</a>
+</p>
 #{/bookmarks}#
 <p />
 #(next-page)#
@ -47,13 +76,11 @@ Tagged with <span class="bookmarkTags">#{tags}#<a href="Bookmarks_p.html?tag=#[t
 #(/next-page)#
 &nbsp;
 </td>
-<td valign="top">
-<a href="Bookmarks_p.html">All</a><br />
+<td valign="top" style="padding-left: 5px; border-left-style: solid; border-left-width: 1px; border-left-color: black;">
+<a href="Bookmarks_p.html" class="bookmarkTags">All</a><br />
 #{taglist}#
-<a href="Bookmarks_p.html?tag=#[tag]#">#[name]#</a><br />
+<a href="Bookmarks_p.html?tag=#[tag]#" class="bookmarkTags">#[name]#</a><br />
 #{/taglist}#
-
-&nbsp;
 </td>
 </tr>
 </table>
--- a/htroot/Network.html
+++ b/htroot/Network.html
@ -61,6 +61,7 @@
 <td class="small"><b>#Seeds</b><br>&nbsp;</td>
 <td class="small"><b>con/h<br></b><br>&nbsp;</td>
 <td class="small"><b>user agent<br></b><br>&nbsp;</td>
+<td class="small"><b>Peer<br>Ping</b><br>&nbsp;</td>
 #(/complete)#
 </tr>
 #{list}#
@ -97,6 +98,7 @@
 <td class="small" align="right">#[seeds]#</td>
 <td class="small" align="right">#[connects]#</td>
 <td class="small" align="right">#[userAgent]#</td>
+<td class="small" align="right">[<a href="Network.html?page=4&peerHash=#[hash]#&peerIP=#[ip]#&peerPort=#[port]#&addPeer=add+Peer">Ping</a>]</td>
 #(/complete)#
 </tr>
 #{/list}#
--- a/htroot/env/style.css
+++ b/htroot/env/style.css
@ -173,5 +173,22 @@ background-color: #eeeeee;
 background-color: #eeeeee;
 }
 .bookmarkTags{
-color: blue;
+color: #007050;
+font-weight:bold;
+text-decoration:none;
+white-space:nowrap;
+}
+.bookmarkTitle{
+line-height: 120%;
+color: #4070a0;
+font-size:17px;
+font-weight:bold;
+text-decoration:none;
+}
+.bookmarkDescription{
+font-style:normal;
+}
+.bookmarkAction{
+color: #999999;
+text-decoration:none;
 }
--- a/htroot/yacy/crawlReceipt.java
+++ b/htroot/yacy/crawlReceipt.java
@ -59,6 +59,7 @@ import de.anomic.server.logging.serverLog;
 import de.anomic.tools.bitfield;
 import de.anomic.tools.crypt;
 import de.anomic.yacy.yacyCore;
+import de.anomic.yacy.yacySeed;

 public final class crawlReceipt {

@ -110,6 +111,10 @@ public final class crawlReceipt {

        */
        
+        final yacySeed otherPeer = yacyCore.seedDB.get(iam);
+        final String otherPeerName = iam + ":" + ((otherPeer == null) ? "NULL" : (otherPeer.getName() + "/" + otherPeer.getVersion()));        
+                
+        
        if ((yacyCore.seedDB.mySeed == null) || (!(yacyCore.seedDB.mySeed.hash.equals(youare)))) {
            // no yacy connection / unknown peers
            prop.put("delay", "3600");
@ -134,7 +139,7 @@ public final class crawlReceipt {
                switchboard.urlPool.noticeURL.remove(newUrlHash);
                switchboard.urlPool.noticeURL.remove(oldUrlHash); 
                
-                log.logInfo("crawlReceipt: RECEIVED RECEIPT for URL " + receivedUrlhash + ":" + entry.url());
+                log.logInfo("crawlReceipt: RECEIVED RECEIPT from " + otherPeerName + " for URL " + receivedUrlhash + ":" + entry.url());
            }
            
            // ready for more
--- a/yacy.logging
+++ b/yacy.logging
@ -18,6 +18,9 @@ PLASMA.level = INFO
 SERVER.level = INFO
 WORDMIGRATION.level = FINE
 FILEHANDLER.level = INFO
+SESSION-POOL.level = INFO
+CRAWLER-POOL.level = INFO
+STACKCRAWL-POOL.level = INFO

 # List of global handlers
 handlers = java.util.logging.FileHandler,\