*)added keywords to IndexCleaner_p.java

*)updated Logging

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

htroot/IndexCleaner_p.java

@@ -1,5 +1,47 @@
-// This file was provided by Hydrox
-// see http://www.yacy-forum.de/viewtopic.php?p=18093#18093
+//-----------------------
+//part of the AnomicHTTPD caching proxy
+//(C) by Michael Peter Christen; mc@anomic.de
+//first published on http://www.anomic.de
+//Frankfurt, Germany, 2005
+//
+//This file is contributed by Matthias Soehnholz
+//
+// $LastChangedDate$
+// $LastChangedRevision$
+// $LastChangedBy$
+//
+//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.
 
 import de.anomic.http.httpHeader;
 import de.anomic.plasma.plasmaCrawlLURL;
@@ -81,4 +123,4 @@ else if (post.get("action").equals("rpause")) {
         }
         return prop;
     }
-}
+}

source/de/anomic/plasma/plasmaCrawlLURL.java

@@ -759,6 +759,7 @@ public void run() {
                             try {
                                 this.wait();
                             } catch (InterruptedException e) {
+                                serverLog.logWarning("URLDBCLEANER", "InterruptedException", e);
                                 this.run = false;
                                 return;
                             }
@@ -774,14 +775,17 @@ public void run() {
                         remove(entry.hash());
                     }
                     lastUrl = entry.url().toString();
-                    lastHash = entry.hash();                        
+                    lastHash = entry.hash();
+                    if (blacklistedUrls % 100 == 0) {
+                        serverLog.logInfo("URLDBCLEANER", "Deleted " + blacklistedUrls + " URLs until now. Last deleted URL-Hash: " + lastBlacklistedUrl);
+                    }
                 }
             } catch (RuntimeException e) {
                 if (e.getMessage().indexOf("not found in LURL") != -1) {
-                    e.printStackTrace();
+                    serverLog.logWarning("URLDBCLEANER", "urlHash not found in LURL", e);
                 }
                 else {
-                    e.printStackTrace();
+                    serverLog.logWarning("URLDBCLEANER", "RuntimeException", e);
                     run = false;
                 }
             } catch (IOException e) {

source/de/anomic/plasma/plasmaWordIndex.java

@@ -566,7 +566,7 @@ public Cleaner(plasmaCrawlLURL lurl, String startHash) {
         }
 
         public void run() {
-            serverLog.logInfo("INDEXCLEANER", "IndexCleaner-Thread stopped");
+            serverLog.logInfo("INDEXCLEANER", "IndexCleaner-Thread started");
             String wordHash = "";
             plasmaWordIndexEntryContainer wordContainer = null;
             plasmaWordIndexEntry entry = null;