From 4fd5b95b1fe38346154e981097aef28321b53f99 Mon Sep 17 00:00:00 2001 From: theli Date: Tue, 30 Aug 2005 21:32:59 +0000 Subject: [PATCH] *) Renaming Logger function names to reflect the proper Java Logging API Loglevels - please use logFine instead of logDebug - please use logSevere instead of logFailure and logError See: http://www.yacy-forum.de/viewtopic.php?p=8726#8726 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@615 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/ProxyIndexingMonitor_p.java | 2 +- htroot/yacy/crawlReceipt.java | 2 +- htroot/yacy/search.java | 2 +- htroot/yacy/transferURL.java | 2 +- source/de/anomic/data/translator.java | 2 +- source/de/anomic/http/httpHeader.java | 4 +-- source/de/anomic/http/httpTemplate.java | 10 +++--- source/de/anomic/http/httpc.java | 4 +-- source/de/anomic/http/httpd.java | 8 ++--- source/de/anomic/http/httpdFileHandler.java | 4 +-- source/de/anomic/http/httpdProxyHandler.java | 10 +++--- source/de/anomic/plasma/plasmaCrawlLURL.java | 8 ++--- .../de/anomic/plasma/plasmaCrawlLoader.java | 6 ++-- source/de/anomic/plasma/plasmaCrawlNURL.java | 2 +- .../de/anomic/plasma/plasmaCrawlProfile.java | 2 +- .../de/anomic/plasma/plasmaCrawlWorker.java | 14 ++++---- source/de/anomic/plasma/plasmaHTCache.java | 4 +-- source/de/anomic/plasma/plasmaParser.java | 4 +-- source/de/anomic/plasma/plasmaSearch.java | 16 +++++----- .../de/anomic/plasma/plasmaSnippetCache.java | 2 +- .../de/anomic/plasma/plasmaSwitchboard.java | 32 +++++++++---------- .../anomic/plasma/plasmaSwitchboardQueue.java | 2 +- .../plasma/plasmaWordIndexAssortment.java | 20 ++++++------ .../anomic/plasma/plasmaWordIndexCache.java | 8 ++--- .../plasmaWordIndexClassicCacheMigration.java | 4 +-- .../plasma/plasmaWordIndexClassicDB.java | 8 ++--- .../plasma/plasmaWordIndexDistribution.java | 18 +++++------ .../de/anomic/server/logging/serverLog.java | 12 +++---- .../logging/serverSimpleLogFormatter.java | 8 ++--- .../anomic/server/serverAbstractSwitch.java | 6 ++-- .../anomic/server/serverAbstractThread.java | 8 ++--- source/de/anomic/server/serverCore.java | 10 +++--- .../de/anomic/server/serverInstantThread.java | 12 +++---- .../server/serverPortForwardingSch.java | 6 ++-- source/de/anomic/yacy/yacyClient.java | 22 ++++++------- source/de/anomic/yacy/yacyCore.java | 6 ++-- source/de/anomic/yacy/yacyDHTAction.java | 2 +- source/de/anomic/yacy/yacyNewsAction.java | 2 +- source/de/anomic/yacy/yacyPeerActions.java | 6 ++-- source/de/anomic/yacy/yacySeed.java | 2 +- source/de/anomic/yacy/yacySeedDB.java | 2 +- source/yacy.java | 24 +++++++------- 42 files changed, 164 insertions(+), 164 deletions(-) diff --git a/htroot/ProxyIndexingMonitor_p.java b/htroot/ProxyIndexingMonitor_p.java index 330b29660..d16c002ac 100644 --- a/htroot/ProxyIndexingMonitor_p.java +++ b/htroot/ProxyIndexingMonitor_p.java @@ -146,7 +146,7 @@ public class ProxyIndexingMonitor_p { } catch (Exception e) { prop.put("info", 2); //Error: errmsg prop.put("info_error", e.getMessage()); - serverLog.logFailure("SERVLET", "ProxyIndexingMonitor.case3", e); + serverLog.logSevere("SERVLET", "ProxyIndexingMonitor.case3", e); } } diff --git a/htroot/yacy/crawlReceipt.java b/htroot/yacy/crawlReceipt.java index 206966f83..e70010c9f 100644 --- a/htroot/yacy/crawlReceipt.java +++ b/htroot/yacy/crawlReceipt.java @@ -117,7 +117,7 @@ public class crawlReceipt { // write log plasmaCrawlLURL.Entry entry = switchboard.urlPool.loadedURL.getEntry(urlhash); if (entry == null) { - switchboard.getLog().logFailure("RECEIVED wrong RECEIPT for hash " + urlhash + " from peer " + iam); + switchboard.getLog().logSevere("RECEIVED wrong RECEIPT for hash " + urlhash + " from peer " + iam); } else { switchboard.getLog().logInfo("RECEIVED RECEIPT for URL " + entry.url().toString()); } diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java index 102554d1e..55fbff0ed 100644 --- a/htroot/yacy/search.java +++ b/htroot/yacy/search.java @@ -77,7 +77,7 @@ public class search { boolean global = ((String) post.get("resource", "global")).equals("global"); // if true, then result may consist of answers from other peers Date remoteTime = yacyCore.parseUniversalDate((String) post.get("mytime")); // read remote time if (yacyCore.seedDB == null) { - yacyCore.log.logFailure("yacy.search: seed cache not initialized"); + yacyCore.log.logSevere("yacy.search: seed cache not initialized"); } else { yacyCore.peerActions.peerArrival(yacySeed.genRemoteSeed(oseed, key, remoteTime), true); } diff --git a/htroot/yacy/transferURL.java b/htroot/yacy/transferURL.java index 4cbaabbec..2099bd7ff 100644 --- a/htroot/yacy/transferURL.java +++ b/htroot/yacy/transferURL.java @@ -107,7 +107,7 @@ public class transferURL { int more = switchboard.urlPool.loadedURL.size() - sizeBefore; doublevalues = Integer.toString(received - more); switchboard.getLog().logInfo("Received " + received + " URLs from peer " + iam); - if ((received - more) > 0) switchboard.getLog().logFailure("Received " + doublevalues + " double URLs from peer " + iam); + if ((received - more) > 0) switchboard.getLog().logSevere("Received " + doublevalues + " double URLs from peer " + iam); result = "ok"; } else { result = "error_not_granted"; diff --git a/source/de/anomic/data/translator.java b/source/de/anomic/data/translator.java index f5f172332..509130261 100644 --- a/source/de/anomic/data/translator.java +++ b/source/de/anomic/data/translator.java @@ -170,7 +170,7 @@ public class translator { if(translateFile(sourceFiles[i], new File(destDir, sourceFiles[i].getName()), (Hashtable)translationLists.get(sourceFiles[i].getName()))){ serverLog.logInfo("Translator", "Translated file: "+ sourceFiles[i].getName()); }else{ - serverLog.logFailure("Translator", "File error while translating file "+sourceFiles[i].getPath()); + serverLog.logSevere("Translator", "File error while translating file "+sourceFiles[i].getPath()); } }else{ serverLog.logInfo("Translator", "No translation for file: "+sourceFiles[i].getPath()); diff --git a/source/de/anomic/http/httpHeader.java b/source/de/anomic/http/httpHeader.java index 919d2d111..8b90ce2c8 100644 --- a/source/de/anomic/http/httpHeader.java +++ b/source/de/anomic/http/httpHeader.java @@ -323,11 +323,11 @@ public final class httpHeader extends TreeMap implements Map { return EMLFormatter.parse(s); } catch (java.text.ParseException e) { //System.out.println("ERROR long version parse: " + e.getMessage() + " at position " + e.getErrorOffset()); - serverLog.logFailure("HTTPC-header", "DATE ERROR (Parse): " + s); + serverLog.logSevere("HTTPC-header", "DATE ERROR (Parse): " + s); return new Date(); } catch (java.lang.NumberFormatException e) { //System.out.println("ERROR long version parse: " + e.getMessage() + " at position " + e.getErrorOffset()); - serverLog.logFailure("HTTPC-header", "DATE ERROR (NumberFormat): " + s); + serverLog.logSevere("HTTPC-header", "DATE ERROR (NumberFormat): " + s); return new Date(); } } diff --git a/source/de/anomic/http/httpTemplate.java b/source/de/anomic/http/httpTemplate.java index cdeb05d7c..c05c500da 100644 --- a/source/de/anomic/http/httpTemplate.java +++ b/source/de/anomic/http/httpTemplate.java @@ -231,7 +231,7 @@ public final class httpTemplate { writeTemplate(pis2, out, pattern, dflt, multi_key + "_" + i + "_"); }//for }else{//transferUntil - serverLog.logFailure("TEMPLATE", "No Close Key found for #{"+multi_key+"}#"); + serverLog.logSevere("TEMPLATE", "No Close Key found for #{"+multi_key+"}#"); } } }else if( (bb & 0xFF) == lrbr ){ //alternatives @@ -275,7 +275,7 @@ public final class httpTemplate { //TODO: better Error Handling transferUntil(pis, keyStream, (new String("%%"+patternName)).getBytes()); if(pis.available()==0){ - serverLog.logFailure("TEMPLATE", "No such Template: %%"+patternName); + serverLog.logSevere("TEMPLATE", "No such Template: %%"+patternName); return; } keyStream=new ByteArrayOutputStream(); @@ -284,7 +284,7 @@ public final class httpTemplate { writeTemplate(pis2, out, pattern, dflt, prefix + key + "_"); transferUntil(pis, keyStream, (new String("#(/"+key+")#")).getBytes()); if(pis.available()==0){ - serverLog.logFailure("TEMPLATE", "No Close Key found for #("+key+")# (by Name)"); + serverLog.logSevere("TEMPLATE", "No Close Key found for #("+key+")# (by Name)"); } }else{ while(!found){ @@ -335,7 +335,7 @@ public final class httpTemplate { if(!found){ text += (char)bb; if(pis.available()==0){ - serverLog.logFailure("TEMPLATE", "No Close Key found for #("+key+")# (by Index)"); + serverLog.logSevere("TEMPLATE", "No Close Key found for #("+key+")# (by Index)"); found=true; } } @@ -380,7 +380,7 @@ public final class httpTemplate { } }catch(IOException e){ //file not found? - serverLog.logFailure("FILEHANDLER","Include Error with file: "+filename); + serverLog.logSevere("FILEHANDLER","Include Error with file: "+filename); } finally { if (br!=null) try{br.close(); br=null;}catch(Exception e){} } diff --git a/source/de/anomic/http/httpc.java b/source/de/anomic/http/httpc.java index e0921a67d..36d404081 100644 --- a/source/de/anomic/http/httpc.java +++ b/source/de/anomic/http/httpc.java @@ -1281,8 +1281,8 @@ do upload if (p > 0) { responseHeader.add(buffer.substring(0, p).trim(), buffer.substring(p + 1).trim()); } else { - serverLog.logFailure("HTTPC", "RESPONSE PARSE ERROR: HOST='" + host + "', PATH='" + requestPath + "', STATUS='" + status + "'"); - serverLog.logFailure("HTTPC", "..............BUFFER: " + buffer); + serverLog.logSevere("HTTPC", "RESPONSE PARSE ERROR: HOST='" + host + "', PATH='" + requestPath + "', STATUS='" + status + "'"); + serverLog.logSevere("HTTPC", "..............BUFFER: " + buffer); } } } diff --git a/source/de/anomic/http/httpd.java b/source/de/anomic/http/httpd.java index a1e2bc50f..3b059cae8 100644 --- a/source/de/anomic/http/httpd.java +++ b/source/de/anomic/http/httpd.java @@ -250,7 +250,7 @@ public final class httpd implements serverHandler { public String error(Throwable e) { // OBLIGATORIC FUNCTION // return string in case of any error that occurs during communication // is always (but not only) called if an IO-dependent exception occurrs. - this.log.logFailure("Unexpected Error. " + e.getClass().getName(),e); + this.log.logSevere("Unexpected Error. " + e.getClass().getName(),e); return "501 Exception occurred: " + e.getMessage(); } @@ -541,10 +541,10 @@ public final class httpd implements serverHandler { // client closed the connection, so we just end silently this.log.logInfo("Client unexpectedly closed connection"); } else { - this.log.logFailure("Unexpected Error. " + e.getClass().getName() + ": " + e.getMessage(),e); + this.log.logSevere("Unexpected Error. " + e.getClass().getName() + ": " + e.getMessage(),e); } } else { - this.log.logFailure("Unexpected Error. " + e.getClass().getName(),e); + this.log.logSevere("Unexpected Error. " + e.getClass().getName(),e); } } } @@ -986,7 +986,7 @@ public final class httpd implements serverHandler { // if we can't find another boundary, then this is an error in the input if (p < 0) { - serverLog.logFailure("HTTPD", "ERROR in PUT body: no ending boundary. probably missing values"); + serverLog.logSevere("HTTPD", "ERROR in PUT body: no ending boundary. probably missing values"); break; } diff --git a/source/de/anomic/http/httpdFileHandler.java b/source/de/anomic/http/httpdFileHandler.java index 28e0bf1fb..ccd9bf581 100644 --- a/source/de/anomic/http/httpdFileHandler.java +++ b/source/de/anomic/http/httpdFileHandler.java @@ -132,7 +132,7 @@ public final class httpdFileHandler extends httpdAbstractHandler implements http mimeTableInputStream = new FileInputStream(new File(switchboard.getRootPath(), mimeTablePath)); this.mimeTable.load(mimeTableInputStream); } catch (Exception e) { - serverLog.logFailure("HTTPDFiles", "ERROR: path to configuration file or configuration invalid\n" + e); + serverLog.logSevere("HTTPDFiles", "ERROR: path to configuration file or configuration invalid\n" + e); System.exit(1); } finally { if (mimeTableInputStream != null) try { mimeTableInputStream.close(); } catch (Exception e1) {} @@ -444,7 +444,7 @@ public final class httpdFileHandler extends httpdAbstractHandler implements http tp.put("clientname", switchboard.getConfig("peerName", "anomic")); //System.out.println("respond props: " + ((tp == null) ? "null" : tp.toString())); // debug } catch (InvocationTargetException e) { - this.theLogger.logFailure("INTERNAL ERROR: " + e.toString() + ":" + + this.theLogger.logSevere("INTERNAL ERROR: " + e.toString() + ":" + e.getMessage() + " target exception at " + rc + ": " + e.getTargetException().toString() + ":" + diff --git a/source/de/anomic/http/httpdProxyHandler.java b/source/de/anomic/http/httpdProxyHandler.java index a52e463a6..130f2dacf 100644 --- a/source/de/anomic/http/httpdProxyHandler.java +++ b/source/de/anomic/http/httpdProxyHandler.java @@ -164,7 +164,7 @@ public final class httpdProxyHandler extends httpdAbstractHandler implements htt serverLog.logInfo("PROXY","Proxy access logging is deactivated."); } } catch (Exception e) { - serverLog.logFailure("PROXY","Unable to configure proxy access logging.",e); + serverLog.logSevere("PROXY","Unable to configure proxy access logging.",e); } } @@ -334,7 +334,7 @@ public final class httpdProxyHandler extends httpdAbstractHandler implements htt } catch (MalformedURLException e) { String errorMsg = "ERROR: internal error with url generation: host=" + host + ", port=" + port + ", path=" + path + ", args=" + args; - serverLog.logFailure("PROXY", errorMsg); + serverLog.logSevere("PROXY", errorMsg); httpd.sendRespondError(conProp,respond,4,501,null,errorMsg,e); return; } @@ -414,7 +414,7 @@ public final class httpdProxyHandler extends httpdAbstractHandler implements htt } else if (!conProp.containsKey(httpd.CONNECTION_PROP_PROXY_RESPOND_HEADER)) { String errorMsg = "Unexpected Error. " + e.getClass().getName() + ": " + e.getMessage(); httpd.sendRespondError(conProp,respond,4,501,null,errorMsg,e); - this.theLogger.logFailure(errorMsg); + this.theLogger.logSevere(errorMsg); } else { this.forceConnectionClose(); } @@ -892,7 +892,7 @@ public final class httpdProxyHandler extends httpdAbstractHandler implements htt } else if (!conProp.containsKey(httpd.CONNECTION_PROP_PROXY_RESPOND_HEADER)) { String errorMsg = "Unexpected Error. " + e.getClass().getName() + ": " + e.getMessage(); httpd.sendRespondError(conProp,respond,4,503,null,errorMsg,e); - this.theLogger.logFailure(errorMsg); + this.theLogger.logSevere(errorMsg); } else { this.forceConnectionClose(); } @@ -984,7 +984,7 @@ public final class httpdProxyHandler extends httpdAbstractHandler implements htt } else if (!conProp.containsKey(httpd.CONNECTION_PROP_PROXY_RESPOND_HEADER)) { String errorMsg = "Unexpected Error. " + e.getClass().getName() + ": " + e.getMessage(); httpd.sendRespondError(conProp,respond,4,503,null,errorMsg,e); - this.theLogger.logFailure(errorMsg); + this.theLogger.logSevere(errorMsg); } else { this.forceConnectionClose(); } diff --git a/source/de/anomic/plasma/plasmaCrawlLURL.java b/source/de/anomic/plasma/plasmaCrawlLURL.java index d22b47c9a..170fe6f3c 100644 --- a/source/de/anomic/plasma/plasmaCrawlLURL.java +++ b/source/de/anomic/plasma/plasmaCrawlLURL.java @@ -312,7 +312,7 @@ public class plasmaCrawlLURL extends plasmaURL { dark = !dark; c++; } catch (Exception e) { - serverLog.logFailure("PLASMA", "genTableProps", e); + serverLog.logSevere("PLASMA", "genTableProps", e); } } prop.put("table_indexed", c); @@ -385,7 +385,7 @@ public class plasmaCrawlLURL extends plasmaURL { return; } } catch (Exception e) { - serverLog.logFailure("PLASMA", "INTERNAL ERROR in plasmaLURL.entry/1: " + e.toString(), e); + serverLog.logSevere("PLASMA", "INTERNAL ERROR in plasmaLURL.entry/1: " + e.toString(), e); } } @@ -417,7 +417,7 @@ public class plasmaCrawlLURL extends plasmaURL { store(); //} } catch (Exception e) { - serverLog.logFailure("PLASMA", "INTERNAL ERROR in plasmaLURL.entry/2: " + e.toString(), e); + serverLog.logSevere("PLASMA", "INTERNAL ERROR in plasmaLURL.entry/2: " + e.toString(), e); } } @@ -446,7 +446,7 @@ public class plasmaCrawlLURL extends plasmaURL { }; urlHashCache.put(entry); } catch (Exception e) { - serverLog.logFailure("PLASMA", "INTERNAL ERROR AT plasmaCrawlLURL:store:" + e.toString(), e); + serverLog.logSevere("PLASMA", "INTERNAL ERROR AT plasmaCrawlLURL:store:" + e.toString(), e); } } diff --git a/source/de/anomic/plasma/plasmaCrawlLoader.java b/source/de/anomic/plasma/plasmaCrawlLoader.java index 6e50d69fe..e73ce9606 100644 --- a/source/de/anomic/plasma/plasmaCrawlLoader.java +++ b/source/de/anomic/plasma/plasmaCrawlLoader.java @@ -160,7 +160,7 @@ public final class plasmaCrawlLoader extends Thread { this.stopped = true; } catch (Exception e) { - this.log.logFailure("plasmaCrawlLoader.run/loop", e); + this.log.logSevere("plasmaCrawlLoader.run/loop", e); } } @@ -173,7 +173,7 @@ public final class plasmaCrawlLoader extends Thread { } catch (Exception e) { // TODO Auto-generated catch block - this.log.logFailure("plasmaCrawlLoader.run/close", e); + this.log.logSevere("plasmaCrawlLoader.run/close", e); } } @@ -197,7 +197,7 @@ public final class plasmaCrawlLoader extends Thread { this.theQueue.addMessage(theMsg); } catch (InterruptedException e) { // TODO Auto-generated catch block - this.log.logFailure("plasmaCrawlLoader.loadParallel", e); + this.log.logSevere("plasmaCrawlLoader.loadParallel", e); } } } diff --git a/source/de/anomic/plasma/plasmaCrawlNURL.java b/source/de/anomic/plasma/plasmaCrawlNURL.java index 6b14235e8..9cac8843d 100644 --- a/source/de/anomic/plasma/plasmaCrawlNURL.java +++ b/source/de/anomic/plasma/plasmaCrawlNURL.java @@ -421,7 +421,7 @@ public class plasmaCrawlNURL extends plasmaURL { } catch (IOException e) { System.out.println("INTERNAL ERROR AT plasmaNURL:store:" + e.toString()); } catch (kelondroException e) { - serverLog.logFailure("PLASMA", "plasmaCrawlNURL.store failed: " + e.getMessage()); + serverLog.logSevere("PLASMA", "plasmaCrawlNURL.store failed: " + e.getMessage()); } } diff --git a/source/de/anomic/plasma/plasmaCrawlProfile.java b/source/de/anomic/plasma/plasmaCrawlProfile.java index af4ecce39..9934243c4 100644 --- a/source/de/anomic/plasma/plasmaCrawlProfile.java +++ b/source/de/anomic/plasma/plasmaCrawlProfile.java @@ -79,7 +79,7 @@ public class plasmaCrawlProfile { profileTableFile.getParentFile().mkdirs(); profileTable = new kelondroMap(new kelondroDyn(profileTableFile, 32000, plasmaURL.urlCrawlProfileHandleLength, 2000)); } catch (IOException e){ - serverLog.logFailure("PLASMA", "plasmaCrawlProfile.resetDatabase", e); + serverLog.logSevere("PLASMA", "plasmaCrawlProfile.resetDatabase", e); } } diff --git a/source/de/anomic/plasma/plasmaCrawlWorker.java b/source/de/anomic/plasma/plasmaCrawlWorker.java index 052aed749..7a81202d7 100644 --- a/source/de/anomic/plasma/plasmaCrawlWorker.java +++ b/source/de/anomic/plasma/plasmaCrawlWorker.java @@ -194,7 +194,7 @@ public final class plasmaCrawlWorker extends Thread { this.setName(this.threadBaseName + "_inPool"); } catch (Exception e1) { - log.logFailure("pool error", e1); + log.logSevere("pool error", e1); } } } @@ -366,7 +366,7 @@ public final class plasmaCrawlWorker extends Thread { // but we clean the cache also, since it may be only partial // and most possible corrupted if (cacheFile.exists()) cacheFile.delete(); - log.logFailure("CRAWLER LOADER ERROR1: with URL=" + url.toString() + ": " + e.toString()); + log.logSevere("CRAWLER LOADER ERROR1: with URL=" + url.toString() + ": " + e.toString()); } } else if (res.status.startsWith("30")) { if (crawlingRetryCount > 0) { @@ -391,7 +391,7 @@ public final class plasmaCrawlWorker extends Thread { // if we are already doing a shutdown we don't need to retry crawling if (Thread.currentThread().isInterrupted()) { - log.logFailure("CRAWLER Retry of URL=" + url.toString() + " aborted because of server shutdown."); + log.logSevere("CRAWLER Retry of URL=" + url.toString() + " aborted because of server shutdown."); return; } @@ -459,18 +459,18 @@ public final class plasmaCrawlWorker extends Thread { } else if (errorMsg.indexOf("Connection refused") >= 0) { log.logWarning("CRAWLER Connection refused while trying to connect to '" + url.toString() + "'."); } else if (errorMsg.indexOf("There is not enough space on the disk") >= 0) { - log.logFailure("CRAWLER Not enough space on the disk detected while crawling '" + url.toString() + "'. " + + log.logSevere("CRAWLER Not enough space on the disk detected while crawling '" + url.toString() + "'. " + "Pausing crawlers. "); plasmaCrawlLoader.switchboard.pauseCrawling(); } else { - log.logFailure("CRAWLER Unexpected Error with URL '" + url.toString() + "': " + e.toString(),e); + log.logSevere("CRAWLER Unexpected Error with URL '" + url.toString() + "': " + e.toString(),e); } if (retryCrawling) { // if we are already doing a shutdown we don't need to retry crawling if (Thread.currentThread().isInterrupted()) { - log.logFailure("CRAWLER Retry of URL=" + url.toString() + " aborted because of server shutdown."); + log.logSevere("CRAWLER Retry of URL=" + url.toString() + " aborted because of server shutdown."); return; } @@ -501,7 +501,7 @@ public final class plasmaCrawlWorker extends Thread { } else { // this may happen if the targeted host does not exist or anything with the // remote server was wrong. - log.logFailure("CRAWLER LOADER ERROR2 with URL=" + url.toString() + ": " + e.toString(),e); + log.logSevere("CRAWLER LOADER ERROR2 with URL=" + url.toString() + ": " + e.toString(),e); } } finally { if (remote != null) httpc.returnInstance(remote); diff --git a/source/de/anomic/plasma/plasmaHTCache.java b/source/de/anomic/plasma/plasmaHTCache.java index 4b47bc9c0..e4f45be63 100644 --- a/source/de/anomic/plasma/plasmaHTCache.java +++ b/source/de/anomic/plasma/plasmaHTCache.java @@ -181,10 +181,10 @@ public final class plasmaHTCache { // this is the case of a "(Not a directory)" error, which should be prohibited // by the shallStoreCache() property. However, sometimes the error still occurs // In this case do nothing. - log.logFailure("File storage failed (not a directory): " + e.getMessage()); + log.logSevere("File storage failed (not a directory): " + e.getMessage()); return false; } catch (IOException e) { - log.logFailure("File storage failed (IO error): " + e.getMessage()); + log.logSevere("File storage failed (IO error): " + e.getMessage()); return false; } writeFileAnnouncement(file); diff --git a/source/de/anomic/plasma/plasmaParser.java b/source/de/anomic/plasma/plasmaParser.java index 3f54dd06a..407aa9185 100644 --- a/source/de/anomic/plasma/plasmaParser.java +++ b/source/de/anomic/plasma/plasmaParser.java @@ -354,7 +354,7 @@ public final class plasmaParser { newEnabledParsers.put(mimeType,availableParserList.get(mimeType)); } catch (Exception e) { - serverLog.logFailure("PARSER", "error in setEnabledParserList", e); + serverLog.logSevere("PARSER", "error in setEnabledParserList", e); } finally { if (theParser != null) try { plasmaParser.theParserPool.returnObject(mimeType,theParser); } catch (Exception e) {} @@ -472,7 +472,7 @@ public final class plasmaParser { } } catch (Exception e) { - serverLog.logFailure("PARSER", "Unable to determine all installed parsers. " + e.getMessage()); + serverLog.logSevere("PARSER", "Unable to determine all installed parsers. " + e.getMessage()); } } diff --git a/source/de/anomic/plasma/plasmaSearch.java b/source/de/anomic/plasma/plasmaSearch.java index d24fb65ef..cb231e6da 100644 --- a/source/de/anomic/plasma/plasmaSearch.java +++ b/source/de/anomic/plasma/plasmaSearch.java @@ -224,7 +224,7 @@ public final class plasmaSearch { if (large.contains(ie)) conj.addEntry(ie); } } catch (kelondroException e) { - serverLog.logFailure("PLASMA", "joinConstructiveByTest: Database corrupt (" + e.getMessage() + "), deleting index"); + serverLog.logSevere("PLASMA", "joinConstructiveByTest: Database corrupt (" + e.getMessage() + "), deleting index"); small.deleteComplete(); return conj; } @@ -243,14 +243,14 @@ public final class plasmaSearch { try { ie1 = (plasmaWordIndexEntry) e1.nextElement(); } catch (kelondroException e) { - serverLog.logFailure("PLASMA", "joinConstructiveByEnumeration: Database corrupt 1 (" + e.getMessage() + "), deleting index"); + serverLog.logSevere("PLASMA", "joinConstructiveByEnumeration: Database corrupt 1 (" + e.getMessage() + "), deleting index"); i1.deleteComplete(); return conj; } try { ie2 = (plasmaWordIndexEntry) e2.nextElement(); } catch (kelondroException e) { - serverLog.logFailure("PLASMA", "joinConstructiveByEnumeration: Database corrupt 2 (" + e.getMessage() + "), deleting index"); + serverLog.logSevere("PLASMA", "joinConstructiveByEnumeration: Database corrupt 2 (" + e.getMessage() + "), deleting index"); i2.deleteComplete(); return conj; } @@ -261,7 +261,7 @@ public final class plasmaSearch { try { if (e1.hasMoreElements()) ie1 = (plasmaWordIndexEntry) e1.nextElement(); else break; } catch (kelondroException e) { - serverLog.logFailure("PLASMA", "joinConstructiveByEnumeration: Database 1 corrupt (" + e.getMessage() + "), deleting index"); + serverLog.logSevere("PLASMA", "joinConstructiveByEnumeration: Database 1 corrupt (" + e.getMessage() + "), deleting index"); i1.deleteComplete(); break; } @@ -269,7 +269,7 @@ public final class plasmaSearch { try { if (e2.hasMoreElements()) ie2 = (plasmaWordIndexEntry) e2.nextElement(); else break; } catch (kelondroException e) { - serverLog.logFailure("PLASMA", "joinConstructiveByEnumeration: Database 2 corrupt (" + e.getMessage() + "), deleting index"); + serverLog.logSevere("PLASMA", "joinConstructiveByEnumeration: Database 2 corrupt (" + e.getMessage() + "), deleting index"); i2.deleteComplete(); break; } @@ -279,14 +279,14 @@ public final class plasmaSearch { try { if (e1.hasMoreElements()) ie1 = (plasmaWordIndexEntry) e1.nextElement(); else break; } catch (kelondroException e) { - serverLog.logFailure("PLASMA", "joinConstructiveByEnumeration: Database 1 corrupt (" + e.getMessage() + "), deleting index"); + serverLog.logSevere("PLASMA", "joinConstructiveByEnumeration: Database 1 corrupt (" + e.getMessage() + "), deleting index"); i1.deleteComplete(); break; } try { if (e2.hasMoreElements()) ie2 = (plasmaWordIndexEntry) e2.nextElement(); else break; } catch (kelondroException e) { - serverLog.logFailure("PLASMA", "joinConstructiveByEnumeration: Database 2 corrupt (" + e.getMessage() + "), deleting index"); + serverLog.logSevere("PLASMA", "joinConstructiveByEnumeration: Database 2 corrupt (" + e.getMessage() + "), deleting index"); i2.deleteComplete(); break; } @@ -315,7 +315,7 @@ public final class plasmaSearch { acc.addResult(entry); } } catch (kelondroException ee) { - serverLog.logFailure("PLASMA", "Database Failure during plasmaSearch.order: " + ee.getMessage(), ee); + serverLog.logSevere("PLASMA", "Database Failure during plasmaSearch.order: " + ee.getMessage(), ee); } long startSortTime = System.currentTimeMillis(); acc.sortResults(); diff --git a/source/de/anomic/plasma/plasmaSnippetCache.java b/source/de/anomic/plasma/plasmaSnippetCache.java index d52132bc6..1c0310a34 100644 --- a/source/de/anomic/plasma/plasmaSnippetCache.java +++ b/source/de/anomic/plasma/plasmaSnippetCache.java @@ -299,7 +299,7 @@ public class plasmaSnippetCache { String nextSnippet = computeSnippet(sentences, remaininghashes, minLength, maxLength); return result + ((nextSnippet == null) ? "" : (" / " + nextSnippet)); } catch (IndexOutOfBoundsException e) { - log.logFailure("computeSnippet: error with string generation", e); + log.logSevere("computeSnippet: error with string generation", e); return ""; } } diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index 60b3ad7ff..375ec6d70 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -592,7 +592,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser try { sbQueue.push((plasmaSwitchboardQueue.Entry) job); } catch (IOException e) { - log.logFailure("IOError in plasmaSwitchboard.enQueue: " + e.getMessage(), e); + log.logSevere("IOError in plasmaSwitchboard.enQueue: " + e.getMessage(), e); } } @@ -619,7 +619,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser nextentry = sbQueue.pop(); if (nextentry == null) return false; } catch (IOException e) { - log.logFailure("IOError in plasmaSwitchboard.deQueue: " + e.getMessage(), e); + log.logSevere("IOError in plasmaSwitchboard.deQueue: " + e.getMessage(), e); return false; } } @@ -735,18 +735,18 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser plasmaCrawlNURL.Entry urlEntry = urlPool.noticeURL.pop(plasmaCrawlNURL.STACK_TYPE_CORE); String stats = "LOCALCRAWL[" + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_CORE) + ", " + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_LIMIT) + ", " + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_OVERHANG) + ", " + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_REMOTE) + "]"; if ((urlEntry.url() == null) || (urlEntry.url().toString().length() < 10)) { - log.logFailure(stats + ": urlEntry.url() == null. URL-Hash: " + ((urlEntry.hash()==null)?"Unknown":urlEntry.hash())); + log.logSevere(stats + ": urlEntry.url() == null. URL-Hash: " + ((urlEntry.hash()==null)?"Unknown":urlEntry.hash())); return true; } String profileHandle = urlEntry.profileHandle(); //System.out.println("DEBUG plasmaSwitchboard.processCrawling: profileHandle = " + profileHandle + ", urlEntry.url = " + urlEntry.url()); if (profileHandle == null) { - log.logFailure(stats + ": NULL PROFILE HANDLE '" + urlEntry.profileHandle() + "' (must be internal error) for URL " + urlEntry.url()); + log.logSevere(stats + ": NULL PROFILE HANDLE '" + urlEntry.profileHandle() + "' (must be internal error) for URL " + urlEntry.url()); return true; } plasmaCrawlProfile.entry profile = profiles.getEntry(profileHandle); if (profile == null) { - log.logFailure(stats + ": LOST PROFILE HANDLE '" + urlEntry.profileHandle() + "' (must be internal error) for URL " + urlEntry.url()); + log.logSevere(stats + ": LOST PROFILE HANDLE '" + urlEntry.profileHandle() + "' (must be internal error) for URL " + urlEntry.url()); return true; } log.logFine("LOCALCRAWL: url=" + urlEntry.url() + ", initiator=" + urlEntry.initiator() + @@ -810,14 +810,14 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser plasmaCrawlNURL.Entry urlEntry = urlPool.noticeURL.pop(plasmaCrawlNURL.STACK_TYPE_LIMIT); String stats = "REMOTECRAWLTRIGGER[" + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_CORE) + ", " + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_LIMIT) + ", " + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_OVERHANG) + ", " + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_REMOTE) + "]"; if (urlEntry.url() == null) { - log.logFailure(stats + ": urlEntry.url() == null"); + log.logSevere(stats + ": urlEntry.url() == null"); return true; } String profileHandle = urlEntry.profileHandle(); //System.out.println("DEBUG plasmaSwitchboard.processCrawling: profileHandle = " + profileHandle + ", urlEntry.url = " + urlEntry.url()); plasmaCrawlProfile.entry profile = profiles.getEntry(profileHandle); if (profile == null) { - log.logFailure(stats + ": LOST PROFILE HANDLE '" + urlEntry.profileHandle() + "' (must be internal error) for URL " + urlEntry.url()); + log.logSevere(stats + ": LOST PROFILE HANDLE '" + urlEntry.profileHandle() + "' (must be internal error) for URL " + urlEntry.url()); return true; } log.logFine("plasmaSwitchboard.limitCrawlTriggerJob: url=" + urlEntry.url() + ", initiator=" + urlEntry.initiator() + @@ -872,7 +872,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser plasmaCrawlNURL.Entry urlEntry = urlPool.noticeURL.pop(plasmaCrawlNURL.STACK_TYPE_REMOTE); String stats = "REMOTETRIGGEREDCRAWL[" + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_CORE) + ", " + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_LIMIT) + ", " + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_OVERHANG) + ", " + urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_REMOTE) + "]"; if (urlEntry.url() == null) { - log.logFailure(stats + ": urlEntry.url() == null"); + log.logSevere(stats + ": urlEntry.url() == null"); return false; } String profileHandle = urlEntry.profileHandle(); @@ -880,7 +880,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser plasmaCrawlProfile.entry profile = profiles.getEntry(profileHandle); if (profile == null) { - log.logFailure(stats + ": LOST PROFILE HANDLE '" + urlEntry.profileHandle() + "' (must be internal error) for URL " + urlEntry.url()); + log.logSevere(stats + ": LOST PROFILE HANDLE '" + urlEntry.profileHandle() + "' (must be internal error) for URL " + urlEntry.url()); return false; } log.logFine("plasmaSwitchboard.remoteTriggeredCrawlJob: url=" + urlEntry.url() + ", initiator=" + urlEntry.initiator() + @@ -937,7 +937,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser return; } if (document == null) { - log.logFailure("(Parser) '" + entry.normalizedURLString() + "' parse failure"); + log.logSevere("(Parser) '" + entry.normalizedURLString() + "' parse failure"); return; } } else { @@ -1038,7 +1038,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser log.logFine("Not Indexed Resource '" + entry.normalizedURLString() + "': process case=" + processCase); } } catch (Exception ee) { - log.logFailure("Could not index URL " + entry.url() + ": " + ee.getMessage(), ee); + log.logSevere("Could not index URL " + entry.url() + ": " + ee.getMessage(), ee); if ((processCase == 6) && (initiator != null)) { yacyClient.crawlReceipt(initiator, "crawl", "exception", ee.getMessage(), null, ""); } @@ -1058,7 +1058,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser document = null; } catch (IOException e) { - log.logFailure("ERROR in plasmaSwitchboard.process(): " + e.toString()); + log.logSevere("ERROR in plasmaSwitchboard.process(): " + e.toString()); } finally { // explicit delete/free resources if ((entry != null) && (entry.profile() != null) && (!(entry.profile().storeHTCache()))) cacheManager.deleteFile(entry.url()); @@ -1075,7 +1075,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser // strange errors if (nexturlString == null) { reason = "denied_(url_null)"; - log.logFailure("Wrong URL in stackCrawl: url=null"); + log.logSevere("Wrong URL in stackCrawl: url=null"); return reason; } /* @@ -1092,7 +1092,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser nexturl = new URL(nexturlString); } catch (MalformedURLException e) { reason = "denied_(url_'" + nexturlString + "'_wrong)"; - log.logFailure("Wrong URL in stackCrawl: " + nexturlString); + log.logSevere("Wrong URL in stackCrawl: " + nexturlString); return reason; } @@ -1250,7 +1250,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser } } catch (Exception e) { // wrong values - log.logFailure("REMOTECRAWLTRIGGER: REMOTE CRAWL TO PEER " + remoteSeed.getName() + " FAILED. CLIENT RETURNED: " + page.toString(), e); + log.logSevere("REMOTECRAWLTRIGGER: REMOTE CRAWL TO PEER " + remoteSeed.getName() + " FAILED. CLIENT RETURNED: " + page.toString(), e); return false; } } @@ -1287,7 +1287,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch implements ser // take some elements and fetch the snippets snippetCache.fetch(acc, queryhashes, urlmask, fetchcount); } catch (IOException e) { - log.logFailure("presearch: failed", e); + log.logSevere("presearch: failed", e); } log.logFine("presearch: job terminated"); } diff --git a/source/de/anomic/plasma/plasmaSwitchboardQueue.java b/source/de/anomic/plasma/plasmaSwitchboardQueue.java index 2aa6bf3ce..b6ceaa3e1 100644 --- a/source/de/anomic/plasma/plasmaSwitchboardQueue.java +++ b/source/de/anomic/plasma/plasmaSwitchboardQueue.java @@ -225,7 +225,7 @@ public class plasmaSwitchboardQueue { if (responseHeader == null) try { responseHeader = htCache.getCachedResponse(plasmaURL.urlHash(url)); } catch (IOException e) { - serverLog.logFailure("PLASMA", "responseHeader: failed to get header", e); + serverLog.logSevere("PLASMA", "responseHeader: failed to get header", e); return null; } return responseHeader; diff --git a/source/de/anomic/plasma/plasmaWordIndexAssortment.java b/source/de/anomic/plasma/plasmaWordIndexAssortment.java index d3e3f95b4..c74202593 100644 --- a/source/de/anomic/plasma/plasmaWordIndexAssortment.java +++ b/source/de/anomic/plasma/plasmaWordIndexAssortment.java @@ -113,7 +113,7 @@ public final class plasmaWordIndexAssortment { if (log != null) log.logConfig("Opened Assortment Database, " + assortments.size() + " entries, width " + assortmentLength + ", " + bufferkb + "kb buffer"); return; } catch (IOException e){ - serverLog.logFailure("PLASMA", "unable to open assortment database, creating new: " + e.getMessage(), e); + serverLog.logSevere("PLASMA", "unable to open assortment database, creating new: " + e.getMessage(), e); } assortmentFile.delete(); // make space for new one } @@ -122,7 +122,7 @@ public final class plasmaWordIndexAssortment { assortments = new kelondroTree(assortmentFile, bufferSize, bufferStructure(assortmentLength)); if (log != null) log.logConfig("Created new Assortment Database, width " + assortmentLength + ", " + bufferkb + "kb buffer"); } catch (IOException e){ - serverLog.logFailure("PLASMA", "unable to create assortment database: " + e.getMessage(), e); + serverLog.logSevere("PLASMA", "unable to create assortment database: " + e.getMessage(), e); } } @@ -146,10 +146,10 @@ public final class plasmaWordIndexAssortment { try { oldrow = assortments.put(row); } catch (IOException e) { - log.logFailure("storeAssortment/IO-error: " + e.getMessage() + " - reset assortment-DB", e); + log.logSevere("storeAssortment/IO-error: " + e.getMessage() + " - reset assortment-DB", e); resetDatabase(); } catch (kelondroException e) { - log.logFailure("storeAssortment/kelondro-error: " + e.getMessage() + " - reset assortment-DB", e); + log.logSevere("storeAssortment/kelondro-error: " + e.getMessage() + " - reset assortment-DB", e); resetDatabase(); } if (oldrow != null) throw new RuntimeException("Store to assortment ambiguous"); @@ -162,11 +162,11 @@ public final class plasmaWordIndexAssortment { try { row = assortments.remove(wordHash.getBytes()); } catch (IOException e) { - log.logFailure("removeAssortment/IO-error: " + e.getMessage() + " - reset assortment-DB", e); + log.logSevere("removeAssortment/IO-error: " + e.getMessage() + " - reset assortment-DB", e); resetDatabase(); return null; } catch (kelondroException e) { - log.logFailure("removeAssortment/kelondro-error: " + e.getMessage() + " - reset assortment-DB", e); + log.logSevere("removeAssortment/kelondro-error: " + e.getMessage() + " - reset assortment-DB", e); resetDatabase(); return null; } @@ -189,7 +189,7 @@ public final class plasmaWordIndexAssortment { try { assortments = new kelondroTree(assortmentFile, bufferSize, bufferStructure(assortmentLength)); } catch (IOException e){ - log.logFailure("unable to re-create assortment database: " + e.getMessage(), e); + log.logSevere("unable to re-create assortment database: " + e.getMessage(), e); } } @@ -197,11 +197,11 @@ public final class plasmaWordIndexAssortment { try { return assortments.keys(up, rot, startWordHash.getBytes()); } catch (IOException e) { - log.logFailure("iterateAssortment/IO-error: " + e.getMessage() + " - reset assortment-DB", e); + log.logSevere("iterateAssortment/IO-error: " + e.getMessage() + " - reset assortment-DB", e); resetDatabase(); return null; } catch (kelondroException e) { - log.logFailure("iterateAssortment/kelondro-error: " + e.getMessage() + " - reset assortment-DB", e); + log.logSevere("iterateAssortment/kelondro-error: " + e.getMessage() + " - reset assortment-DB", e); resetDatabase(); return null; } @@ -215,7 +215,7 @@ public final class plasmaWordIndexAssortment { try { assortments.close(); } catch (IOException e){ - log.logFailure("unable to close assortment database: " + e.getMessage(), e); + log.logSevere("unable to close assortment database: " + e.getMessage(), e); } } diff --git a/source/de/anomic/plasma/plasmaWordIndexCache.java b/source/de/anomic/plasma/plasmaWordIndexCache.java index 6a431ff90..9e7092f29 100644 --- a/source/de/anomic/plasma/plasmaWordIndexCache.java +++ b/source/de/anomic/plasma/plasmaWordIndexCache.java @@ -127,7 +127,7 @@ public final class plasmaWordIndexCache implements plasmaWordIndexInterface { try { restore(); } catch (IOException e){ - log.logFailure("unable to restore cache dump: " + e.getMessage(), e); + log.logSevere("unable to restore cache dump: " + e.getMessage(), e); } // start permanent flushing @@ -236,7 +236,7 @@ public final class plasmaWordIndexCache implements plasmaWordIndexInterface { log.logConfig("restored " + cache.size() + " words in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds"); } catch (kelondroException e) { // restore failed - log.logFailure("restore of indexCache array dump failed: " + e.getMessage(), e); + log.logSevere("restore of indexCache array dump failed: " + e.getMessage(), e); } finally { if (dumpArray != null) try {dumpArray.close();}catch(Exception e){} } @@ -359,7 +359,7 @@ public final class plasmaWordIndexCache implements plasmaWordIndexInterface { flushFromMem(hash); } } catch (Exception e) { - log.logFailure("flushFromMem: " + e.getMessage(), e); + log.logSevere("flushFromMem: " + e.getMessage(), e); } flushThread.proceed(); } @@ -520,7 +520,7 @@ public final class plasmaWordIndexCache implements plasmaWordIndexInterface { try { dump(waitingSeconds); } catch (IOException e){ - log.logFailure("unable to dump cache: " + e.getMessage(), e); + log.logSevere("unable to dump cache: " + e.getMessage(), e); } } diff --git a/source/de/anomic/plasma/plasmaWordIndexClassicCacheMigration.java b/source/de/anomic/plasma/plasmaWordIndexClassicCacheMigration.java index f0bc2a233..0267ca34e 100644 --- a/source/de/anomic/plasma/plasmaWordIndexClassicCacheMigration.java +++ b/source/de/anomic/plasma/plasmaWordIndexClassicCacheMigration.java @@ -127,7 +127,7 @@ public class plasmaWordIndexClassicCacheMigration { try { return indexCache.rows(true, false, null); } catch (kelondroException e) { - de.anomic.server.logging.serverLog.logFailure("PLASMA", "kelondro error in plasmaWordIndexFileCache: " + e.getMessage()); + de.anomic.server.logging.serverLog.logSevere("PLASMA", "kelondro error in plasmaWordIndexFileCache: " + e.getMessage()); return new HashSet().iterator(); } } @@ -171,7 +171,7 @@ public class plasmaWordIndexClassicCacheMigration { remove(hash); return true; } catch (Exception e) { - serverLog.logFailure("PLASMA MIGRATION", "oneStepMigration error: " + e.getMessage(), e); + serverLog.logSevere("PLASMA MIGRATION", "oneStepMigration error: " + e.getMessage(), e); return false; } } diff --git a/source/de/anomic/plasma/plasmaWordIndexClassicDB.java b/source/de/anomic/plasma/plasmaWordIndexClassicDB.java index f3d28bd8f..3db074824 100644 --- a/source/de/anomic/plasma/plasmaWordIndexClassicDB.java +++ b/source/de/anomic/plasma/plasmaWordIndexClassicDB.java @@ -185,7 +185,7 @@ public class plasmaWordIndexClassicDB implements plasmaWordIndexInterface { try { return new plasmaWordIndexEntity(databaseRoot, wordHash, deleteIfEmpty); } catch (IOException e) { - log.logFailure("plasmaWordIndexClassic.getIndex: " + e.getMessage()); + log.logSevere("plasmaWordIndexClassic.getIndex: " + e.getMessage()); return null; } } @@ -200,7 +200,7 @@ public class plasmaWordIndexClassicDB implements plasmaWordIndexInterface { try { plasmaWordIndexEntity.removePlasmaIndex(databaseRoot, wordHash); } catch (IOException e) { - log.logFailure("plasmaWordIndexClassic.deleteIndex: " + e.getMessage()); + log.logSevere("plasmaWordIndexClassic.deleteIndex: " + e.getMessage()); return; } } @@ -218,7 +218,7 @@ public class plasmaWordIndexClassicDB implements plasmaWordIndexInterface { if ((deleteComplete) && (size == 0)) deleteIndex(wordHash); return count; } catch (IOException e) { - log.logFailure("plasmaWordIndexClassic.removeEntries: " + e.getMessage()); + log.logSevere("plasmaWordIndexClassic.removeEntries: " + e.getMessage()); return count; } } @@ -238,7 +238,7 @@ public class plasmaWordIndexClassicDB implements plasmaWordIndexInterface { pi = null; return count; } catch (IOException e) { - log.logFailure("plasmaWordIndexClassic.addEntries: " + e.getMessage()); + log.logSevere("plasmaWordIndexClassic.addEntries: " + e.getMessage()); return 0; } } diff --git a/source/de/anomic/plasma/plasmaWordIndexDistribution.java b/source/de/anomic/plasma/plasmaWordIndexDistribution.java index b61438aa8..3fd37305b 100644 --- a/source/de/anomic/plasma/plasmaWordIndexDistribution.java +++ b/source/de/anomic/plasma/plasmaWordIndexDistribution.java @@ -162,7 +162,7 @@ public class plasmaWordIndexDistribution { long start; while ((e.hasMoreElements()) && (hc < peerCount)) { if (closed) { - log.logFailure("Index distribution interrupted by close, nothing deleted locally."); + log.logSevere("Index distribution interrupted by close, nothing deleted locally."); return -1; // interrupted } seed = (yacySeed) e.nextElement(); @@ -195,11 +195,11 @@ public class plasmaWordIndexDistribution { log.logFine("Deleted all " + indexEntities.length + " transferred whole-word indexes locally"); return indexCount; } else { - log.logFailure("Deleted not all transferred whole-word indexes"); + log.logSevere("Deleted not all transferred whole-word indexes"); return -1; } } catch (IOException ee) { - log.logFailure("Deletion of indexes not possible:" + ee.getMessage(), ee); + log.logSevere("Deletion of indexes not possible:" + ee.getMessage(), ee); return -1; } } else { @@ -210,7 +210,7 @@ public class plasmaWordIndexDistribution { } return indexCount; } else { - log.logFailure("Index distribution failed. Too less peers (" + hc + ") received the index, not deleted locally."); + log.logSevere("Index distribution failed. Too less peers (" + hc + ") received the index, not deleted locally."); return -1; } } @@ -277,7 +277,7 @@ public class plasmaWordIndexDistribution { log.logFine("Selected whole index (" + indexEntity.size() + " URLs, " + unknownURLEntries.size() + " not bound) for word " + indexEntity.wordHash()); count -= indexEntity.size(); } catch (kelondroException e) { - log.logFailure("plasmaWordIndexDistribution/1: deleted DB for word " + indexEntity.wordHash(), e); + log.logSevere("plasmaWordIndexDistribution/1: deleted DB for word " + indexEntity.wordHash(), e); try {indexEntity.deleteComplete();} catch (IOException ee) {} } } else { @@ -311,7 +311,7 @@ public class plasmaWordIndexDistribution { log.logFine("Selected partial index (" + tmpEntity.size() + " from " + indexEntity.size() +" URLs, " + unknownURLEntries.size() + " not bound) for word " + tmpEntity.wordHash()); tmpEntities.add(tmpEntity); } catch (kelondroException e) { - log.logFailure("plasmaWordIndexDistribution/2: deleted DB for word " + indexEntity.wordHash(), e); + log.logSevere("plasmaWordIndexDistribution/2: deleted DB for word " + indexEntity.wordHash(), e); try {indexEntity.deleteComplete();} catch (IOException ee) {} } indexEntity.close(); // important: is not closed elswhere and cannot be deleted afterwards @@ -324,10 +324,10 @@ public class plasmaWordIndexDistribution { for (int i = 0; i < tmpEntities.size(); i++) indexEntities[i] = (plasmaWordIndexEntity) tmpEntities.elementAt(i); return new Object[]{indexEntities, knownURLs}; } catch (IOException e) { - log.logFailure("selectTransferIndexes IO-Error (hash=" + nexthash + "): " + e.getMessage(), e); + log.logSevere("selectTransferIndexes IO-Error (hash=" + nexthash + "): " + e.getMessage(), e); return new Object[]{new plasmaWordIndexEntity[0], new HashMap()}; } catch (kelondroException e) { - log.logFailure("selectTransferIndexes database corrupted: " + e.getMessage(), e); + log.logSevere("selectTransferIndexes database corrupted: " + e.getMessage(), e); return new Object[]{new plasmaWordIndexEntity[0], new HashMap()}; } } @@ -373,7 +373,7 @@ public class plasmaWordIndexDistribution { // have another try... if (!(plasmaWordIndexEntity.wordHash2path(wordIndex.getRoot() /*PLASMADB*/, indexEntities[i].wordHash()).delete())) { success = false; - log.logFailure("Could not delete whole index for word " + indexEntities[i].wordHash()); + log.logSevere("Could not delete whole index for word " + indexEntities[i].wordHash()); } } } diff --git a/source/de/anomic/server/logging/serverLog.java b/source/de/anomic/server/logging/serverLog.java index 9e88b949b..9fc74d8bf 100644 --- a/source/de/anomic/server/logging/serverLog.java +++ b/source/de/anomic/server/logging/serverLog.java @@ -52,7 +52,7 @@ public final class serverLog { // // log-level categories public static final int LOGLEVEL_ZERO = Level.OFF.intValue(); // no output at all - public static final int LOGLEVEL_FAILURE = Level.SEVERE.intValue(); // system-level error, internal cause, critical and not fixeable (i.e. inconsistency) + public static final int LOGLEVEL_SEVERE = Level.SEVERE.intValue(); // system-level error, internal cause, critical and not fixeable (i.e. inconsistency) public static final int LOGLEVEL_WARNING = Level.WARNING.intValue(); // uncritical service failure, may require user activity (i.e. input required, wrong authorization) public static final int LOGLEVEL_CONFIG = Level.CONFIG.intValue(); // regular system status information (i.e. start-up messages) public static final int LOGLEVEL_INFO = Level.INFO.intValue(); // regular action information (i.e. any httpd request URL) @@ -60,7 +60,7 @@ public final class serverLog { // // // these categories are also present as character tokens public static final char LOGTOKEN_ZERO = 'Z'; - public static final char LOGTOKEN_FAILURE = 'E'; + public static final char LOGTOKEN_SEVERE = 'E'; public static final char LOGTOKEN_WARNING = 'W'; public static final char LOGTOKEN_CONFIG = 'S'; public static final char LOGTOKEN_INFO = 'I'; @@ -77,8 +77,8 @@ public final class serverLog { this.theLogger.setLevel(newLevel); } - public void logFailure(String message) {this.theLogger.severe(message);} - public void logFailure(String message, Throwable thrown) {this.theLogger.log(Level.SEVERE,message,thrown);} + public void logSevere(String message) {this.theLogger.severe(message);} + public void logSevere(String message, Throwable thrown) {this.theLogger.log(Level.SEVERE,message,thrown);} public void logWarning(String message) {this.theLogger.warning(message);} public void logWarning(String message, Throwable thrown) {this.theLogger.log(Level.WARNING,message,thrown);} @@ -102,10 +102,10 @@ public final class serverLog { this.theLogger.log(level, msg, thrown); } - public static void logFailure(String appName, String message) { + public static void logSevere(String appName, String message) { Logger.getLogger(appName).severe(message); } - public static void logFailure(String appName, String message, Throwable thrown) { + public static void logSevere(String appName, String message, Throwable thrown) { Logger.getLogger(appName).log(Level.SEVERE,message,thrown); } diff --git a/source/de/anomic/server/logging/serverSimpleLogFormatter.java b/source/de/anomic/server/logging/serverSimpleLogFormatter.java index 86ffc1baa..6dafa13b1 100644 --- a/source/de/anomic/server/logging/serverSimpleLogFormatter.java +++ b/source/de/anomic/server/logging/serverSimpleLogFormatter.java @@ -31,10 +31,10 @@ public class serverSimpleLogFormatter extends SimpleFormatter { // adding the loglevel int logLevel = record.getLevel().intValue(); - if (logLevel == serverLog.LOGLEVEL_FAILURE) - this.buffer.append(serverLog.LOGTOKEN_FAILURE); - else if (logLevel == serverLog.LOGLEVEL_FAILURE) - this.buffer.append(serverLog.LOGTOKEN_FAILURE); + if (logLevel == serverLog.LOGLEVEL_SEVERE) + this.buffer.append(serverLog.LOGTOKEN_SEVERE); + else if (logLevel == serverLog.LOGLEVEL_SEVERE) + this.buffer.append(serverLog.LOGTOKEN_SEVERE); else if (logLevel == serverLog.LOGLEVEL_WARNING) this.buffer.append(serverLog.LOGTOKEN_WARNING); else if (logLevel == serverLog.LOGLEVEL_CONFIG) diff --git a/source/de/anomic/server/serverAbstractSwitch.java b/source/de/anomic/server/serverAbstractSwitch.java index 95ce8ee69..75145d884 100644 --- a/source/de/anomic/server/serverAbstractSwitch.java +++ b/source/de/anomic/server/serverAbstractSwitch.java @@ -146,7 +146,7 @@ public abstract class serverAbstractSwitch implements serverSwitch { try { action.doBevoreSetConfig(key, value); } catch (Exception e) { - log.logFailure("serverAction bevoreSetConfig '" + action.getShortDescription() + "' failed with exception: " + e.getMessage()); + log.logSevere("serverAction bevoreSetConfig '" + action.getShortDescription() + "' failed with exception: " + e.getMessage()); } } @@ -162,7 +162,7 @@ public abstract class serverAbstractSwitch implements serverSwitch { try { action.doAfterSetConfig(key, value, oldValue); } catch (Exception e) { - log.logFailure("serverAction afterSetConfig '" + action.getShortDescription() + "' failed with exception: " + e.getMessage()); + log.logSevere("serverAction afterSetConfig '" + action.getShortDescription() + "' failed with exception: " + e.getMessage()); } } } @@ -181,7 +181,7 @@ public abstract class serverAbstractSwitch implements serverSwitch { try { action.doWhenGetConfig(key, s, dflt); } catch (Exception e) { - log.logFailure("serverAction whenGetConfig '" + action.getShortDescription() + "' failed with exception: " + e.getMessage()); + log.logSevere("serverAction whenGetConfig '" + action.getShortDescription() + "' failed with exception: " + e.getMessage()); } } diff --git a/source/de/anomic/server/serverAbstractThread.java b/source/de/anomic/server/serverAbstractThread.java index 9d9b78cb1..f90d2bad2 100644 --- a/source/de/anomic/server/serverAbstractThread.java +++ b/source/de/anomic/server/serverAbstractThread.java @@ -184,13 +184,13 @@ public abstract class serverAbstractThread extends Thread implements serverThrea } private final void logError(String text) { - if (log == null) serverLog.logFailure("THREAD-CONTROL", text); - else log.logFailure(text); + if (log == null) serverLog.logSevere("THREAD-CONTROL", text); + else log.logSevere(text); } private final void logError(String text,Throwable thrown) { - if (log == null) serverLog.logFailure("THREAD-CONTROL", text, thrown); - else log.logFailure(text,thrown); + if (log == null) serverLog.logSevere("THREAD-CONTROL", text, thrown); + else log.logSevere(text,thrown); } private void logSystem(String text) { diff --git a/source/de/anomic/server/serverCore.java b/source/de/anomic/server/serverCore.java index b0505cd65..bfeed4964 100644 --- a/source/de/anomic/server/serverCore.java +++ b/source/de/anomic/server/serverCore.java @@ -221,10 +221,10 @@ public final class serverCore extends serverAbstractThread implements serverThre try { this.initPortForwarding(); } catch (Exception e) { - this.log.logFailure("Unable to initialize server port forwarding.",e); + this.log.logSevere("Unable to initialize server port forwarding.",e); this.switchboard.setConfig("portForwardingEnabled","false"); } catch (Error e) { - this.log.logFailure("Unable to initialize server port forwarding.",e); + this.log.logSevere("Unable to initialize server port forwarding.",e); this.switchboard.setConfig("portForwardingEnabled","false"); } @@ -562,7 +562,7 @@ public final class serverCore extends serverAbstractThread implements serverThre serverCore.this.log.logInfo("Shutdown of remaining session threads finish."); } catch (Exception e) { - serverCore.this.log.logFailure("Unexpected error while trying to shutdown all remaining session threads.",e); + serverCore.this.log.logSevere("Unexpected error while trying to shutdown all remaining session threads.",e); } super.close(); @@ -1016,10 +1016,10 @@ public final class serverCore extends serverAbstractThread implements serverThre return readLineBuffer.toByteArray(); } catch (ClosedByInterruptException e) { - if (logerr) serverLog.logFailure("SERVER", "receive interrupted - timeout"); + if (logerr) serverLog.logSevere("SERVER", "receive interrupted - timeout"); return null; } catch (IOException e) { - if (logerr) serverLog.logFailure("SERVER", "receive interrupted - exception 2 = " + e.getMessage()); + if (logerr) serverLog.logSevere("SERVER", "receive interrupted - exception 2 = " + e.getMessage()); return null; } } diff --git a/source/de/anomic/server/serverInstantThread.java b/source/de/anomic/server/serverInstantThread.java index e24d5ff59..f492f895a 100644 --- a/source/de/anomic/server/serverInstantThread.java +++ b/source/de/anomic/server/serverInstantThread.java @@ -84,7 +84,7 @@ public final class serverInstantThread extends serverAbstractThread implements s } catch (IllegalArgumentException e) { return -1; } catch (InvocationTargetException e) { - serverLog.logFailure("SERVER", "invocation serverInstantThread of thread '" + this.getName() + "': " + e.getMessage(), e); + serverLog.logSevere("SERVER", "invocation serverInstantThread of thread '" + this.getName() + "': " + e.getMessage(), e); return -1; } } @@ -96,15 +96,15 @@ public final class serverInstantThread extends serverAbstractThread implements s if (result == null) jobHasDoneSomething = true; else if (result instanceof Boolean) jobHasDoneSomething = ((Boolean) result).booleanValue(); } catch (IllegalAccessException e) { - serverLog.logFailure("SERVER", "Internal Error in serverInstantThread: " + e.getMessage()); - serverLog.logFailure("SERVER", "shutting down thread '" + this.getName() + "'"); + serverLog.logSevere("SERVER", "Internal Error in serverInstantThread: " + e.getMessage()); + serverLog.logSevere("SERVER", "shutting down thread '" + this.getName() + "'"); this.terminate(false); } catch (IllegalArgumentException e) { - serverLog.logFailure("SERVER", "Internal Error in serverInstantThread: " + e.getMessage()); - serverLog.logFailure("SERVER", "shutting down thread '" + this.getName() + "'"); + serverLog.logSevere("SERVER", "Internal Error in serverInstantThread: " + e.getMessage()); + serverLog.logSevere("SERVER", "shutting down thread '" + this.getName() + "'"); this.terminate(false); } catch (InvocationTargetException e) { - serverLog.logFailure("SERVER", "Runtime Error in serverInstantThread, thread '" + this.getName() + "': " + e.getMessage(), e); + serverLog.logSevere("SERVER", "Runtime Error in serverInstantThread, thread '" + this.getName() + "': " + e.getMessage(), e); } return jobHasDoneSomething; } diff --git a/source/de/anomic/server/serverPortForwardingSch.java b/source/de/anomic/server/serverPortForwardingSch.java index be3c30520..5301476cb 100644 --- a/source/de/anomic/server/serverPortForwardingSch.java +++ b/source/de/anomic/server/serverPortForwardingSch.java @@ -89,7 +89,7 @@ public class serverPortForwardingSch implements serverPortForwarding{ throw new IllegalStateException("Missing library."); } } catch (Exception e) { - this.log.logFailure("Unable to initialize port forwarding.",e); + this.log.logSevere("Unable to initialize port forwarding.",e); throw e; } } @@ -150,7 +150,7 @@ public class serverPortForwardingSch implements serverPortForwarding{ this.localHost + ":" + this.localHostPort); } catch(Exception e){ - this.log.logFailure("Unable to connect to remote port forwarding host.",e); + this.log.logSevere("Unable to connect to remote port forwarding host.",e); throw new IOException(e.getMessage()); } } @@ -177,7 +177,7 @@ public class serverPortForwardingSch implements serverPortForwarding{ session.disconnect(); this.log.logFine("Successfully disconnected from port forwarding host."); } catch (Exception e) { - this.log.logFailure("Error while trying to disconnect from port forwarding host.",e); + this.log.logSevere("Error while trying to disconnect from port forwarding host.",e); throw new IOException(e.getMessage()); } } diff --git a/source/de/anomic/yacy/yacyClient.java b/source/de/anomic/yacy/yacyClient.java index 94cdbeaa5..f1562d9dd 100644 --- a/source/de/anomic/yacy/yacyClient.java +++ b/source/de/anomic/yacy/yacyClient.java @@ -224,7 +224,7 @@ public class yacyClient { Date remoteTime = yacyCore.parseUniversalDate((String) result.get("mytime")); // read remote time return yacySeed.genRemoteSeed((String) result.get("response"), key, remoteTime); } catch (Exception e) { - yacyCore.log.logFailure("yacyClient.querySeed error:" + e.getMessage()); + yacyCore.log.logSevere("yacyClient.querySeed error:" + e.getMessage()); return null; } } @@ -241,7 +241,7 @@ public class yacyClient { if ((result == null) || (result.size() == 0)) return -1; return Integer.parseInt((String) result.get("response")); } catch (Exception e) { - yacyCore.log.logFailure("yacyClient.queryRWICount error:" + e.getMessage()); + yacyCore.log.logSevere("yacyClient.queryRWICount error:" + e.getMessage()); return -1; } } @@ -264,7 +264,7 @@ public class yacyClient { String resp = (String) result.get("response"); if (resp == null) return -1; else return Integer.parseInt(resp); } catch (Exception e) { - yacyCore.log.logFailure("yacyClient.queryUrlCount error asking peer '" + target.getName() + "':" + e.toString()); + yacyCore.log.logSevere("yacyClient.queryUrlCount error asking peer '" + target.getName() + "':" + e.toString()); return -1; } } @@ -385,7 +385,7 @@ public class yacyClient { yacyCore.log.logFine("yacyClient.search: processed " + results + " links from peer " + targetPeer.hash + ", score=" + targetPeer.selectscore + ", DHTdist=" + yacyDHTAction.dhtDistance(targetPeer.hash, wordhashes) + ", duetime=" + duetime + ", searchtime=" + searchtime + ", netdelay=" + (totalrequesttime - searchtime) + ", references=" + result.get("references")); return results; } catch (Exception e) { - yacyCore.log.logFailure("yacyClient.search error: '" + targetPeer.get("Name", "anonymous") + "' failed - " + e); + yacyCore.log.logSevere("yacyClient.search error: '" + targetPeer.get("Name", "anonymous") + "' failed - " + e); //e.printStackTrace(); return 0; } @@ -419,7 +419,7 @@ public class yacyClient { 8000, null, null, yacyCore.seedDB.sb.remoteProxyHost, yacyCore.seedDB.sb.remoteProxyPort, post)); } catch (Exception e) { // most probably a network time-out exception - yacyCore.log.logFailure("yacyClient.permissionMessage error:" + e.getMessage()); + yacyCore.log.logSevere("yacyClient.permissionMessage error:" + e.getMessage()); return null; } } @@ -448,7 +448,7 @@ public class yacyClient { //System.out.println("V=" + v.toString()); return nxTools.table(v); } catch (Exception e) { - yacyCore.log.logFailure("yacyClient.postMessage error:" + e.getMessage()); + yacyCore.log.logSevere("yacyClient.postMessage error:" + e.getMessage()); return null; } } @@ -480,7 +480,7 @@ public class yacyClient { 10000, null, null, yacyCore.seedDB.sb.remoteProxyHost, yacyCore.seedDB.sb.remoteProxyPort, post)); } catch (Exception e) { // most probably a network time-out exception - yacyCore.log.logFailure("yacyClient.crawlOrder error: peer=" + targetSeed.getName() + ", error=" + e.getMessage()); + yacyCore.log.logSevere("yacyClient.crawlOrder error: peer=" + targetSeed.getName() + ", error=" + e.getMessage()); return null; } } @@ -538,7 +538,7 @@ public class yacyClient { 60000, null, null, yacyCore.seedDB.sb.remoteProxyHost, yacyCore.seedDB.sb.remoteProxyPort)); } catch (Exception e) { // most probably a network time-out exception - yacyCore.log.logFailure("yacyClient.crawlReceipt error:" + e.getMessage()); + yacyCore.log.logSevere("yacyClient.crawlReceipt error:" + e.getMessage()); return null; } } @@ -621,7 +621,7 @@ public class yacyClient { HashMap result = nxTools.table(v); return result; } catch (Exception e) { - yacyCore.log.logFailure("yacyClient.transferRWI error:" + e.getMessage()); + yacyCore.log.logSevere("yacyClient.transferRWI error:" + e.getMessage()); return null; } } @@ -656,7 +656,7 @@ public class yacyClient { } return nxTools.table(v); } catch (Exception e) { - yacyCore.log.logFailure("yacyClient.transferRWI error:" + e.getMessage()); + yacyCore.log.logSevere("yacyClient.transferRWI error:" + e.getMessage()); return null; } } @@ -673,7 +673,7 @@ public class yacyClient { yacyCore.seedDB.sb.remoteProxyHost, yacyCore.seedDB.sb.remoteProxyPort, post); return nxTools.table(v); } catch (Exception e) { - yacyCore.log.logFailure("yacyClient.getProfile error:" + e.getMessage()); + yacyCore.log.logSevere("yacyClient.getProfile error:" + e.getMessage()); return null; } } diff --git a/source/de/anomic/yacy/yacyCore.java b/source/de/anomic/yacy/yacyCore.java index 094e026df..7b3395614 100644 --- a/source/de/anomic/yacy/yacyCore.java +++ b/source/de/anomic/yacy/yacyCore.java @@ -337,7 +337,7 @@ public class yacyCore { log.logInfo("publish: handshaked " + this.seed.get("PeerType", "senior") + " peer '" + this.seed.getName() + "' at " + this.seed.getAddress()); } } catch (Exception e) { - log.logFailure("publishThread: error with target seed " + seed.getMap() + ": " + e.getMessage(), e); + log.logSevere("publishThread: error with target seed " + seed.getMap() + ": " + e.getMessage(), e); this.error = e; } finally { this.syncList.add(this); @@ -387,7 +387,7 @@ public class yacyCore { else seedDB.mySeed.put("news", de.anomic.tools.crypt.simpleEncode(record.toString())); } catch (IOException e) { - log.logFailure("publishMySeed: problem with news encoding", e); + log.logSevere("publishMySeed: problem with news encoding", e); } // holding a reference to all started threads @@ -692,7 +692,7 @@ public class yacyCore { if (logt.indexOf("Error") >= 0) { seedDB.mySeed.put("PeerType", prevStatus); String errorMsg = "SaveSeedList: seed upload failed using " + uploader.getClass().getName() + " (error): " + logt.substring(logt.indexOf("Error") + 6); - log.logFailure(errorMsg); + log.logSevere(errorMsg); return errorMsg; } log.logInfo(logt); diff --git a/source/de/anomic/yacy/yacyDHTAction.java b/source/de/anomic/yacy/yacyDHTAction.java index 117425b67..ec28c3479 100644 --- a/source/de/anomic/yacy/yacyDHTAction.java +++ b/source/de/anomic/yacy/yacyDHTAction.java @@ -137,7 +137,7 @@ public class yacyDHTAction implements yacyPeerAction { if (s.getFlagAcceptRemoteIndex()) return s; } } catch (kelondroException e) { - yacyCore.log.logFailure("database inconsistency (" + e.getMessage() + "), re-set of db."); + yacyCore.log.logSevere("database inconsistency (" + e.getMessage() + "), re-set of db."); seedDB.resetActiveTable(); return null; } diff --git a/source/de/anomic/yacy/yacyNewsAction.java b/source/de/anomic/yacy/yacyNewsAction.java index 65f2a5eb1..e392c150a 100644 --- a/source/de/anomic/yacy/yacyNewsAction.java +++ b/source/de/anomic/yacy/yacyNewsAction.java @@ -70,7 +70,7 @@ public class yacyNewsAction implements yacyPeerAction { try { synchronized (pool) {this.pool.enqueueIncomingNews(record);} } catch (IOException e) { - serverLog.logFailure("YACY", "processPeerArrival", e); + serverLog.logSevere("YACY", "processPeerArrival", e); } } diff --git a/source/de/anomic/yacy/yacyPeerActions.java b/source/de/anomic/yacy/yacyPeerActions.java index 7ac3a5913..180ba3e2f 100644 --- a/source/de/anomic/yacy/yacyPeerActions.java +++ b/source/de/anomic/yacy/yacyPeerActions.java @@ -184,7 +184,7 @@ public class yacyPeerActions { } catch (Exception e) { // this is when wget fails; may be because of missing internet connection // we do nothing here and go silently over it - yacyCore.log.logFailure("BOOTSTRAP: failed to load seeds from seed-list URL " + seedListFileURL); + yacyCore.log.logSevere("BOOTSTRAP: failed to load seeds from seed-list URL " + seedListFileURL); } } } @@ -242,10 +242,10 @@ public class yacyPeerActions { // returns true if the peer is new and previously unknown String error; if (seed == null) { - yacyCore.log.logFailure("connect: WRONG seed (NULL)"); + yacyCore.log.logSevere("connect: WRONG seed (NULL)"); return false; } else if ((error = seed.isProper()) != null) { - yacyCore.log.logFailure("connect: WRONG seed (" + seed.getName() + "/" + seed.hash + "): " + error); + yacyCore.log.logSevere("connect: WRONG seed (" + seed.getName() + "/" + seed.hash + "): " + error); return false; } else if ((seedDB.mySeed != null) && (seed.hash.equals(seedDB.mySeed.hash))) { yacyCore.log.logInfo("connect: SELF reference " + seed.getAddress()); diff --git a/source/de/anomic/yacy/yacySeed.java b/source/de/anomic/yacy/yacySeed.java index 0304252cf..a640b9d47 100644 --- a/source/de/anomic/yacy/yacySeed.java +++ b/source/de/anomic/yacy/yacySeed.java @@ -332,7 +332,7 @@ public class yacySeed { yacyCore.log.logInfo("init: OWN SEED = " + hash); if (hash.length() != yacySeedDB.commonHashLength) { - yacyCore.log.logFailure("YACY Internal error: distributed hash conceptual error"); + yacyCore.log.logSevere("YACY Internal error: distributed hash conceptual error"); System.exit(-1); } diff --git a/source/de/anomic/yacy/yacySeedDB.java b/source/de/anomic/yacy/yacySeedDB.java index 98e5b6a40..51bb86743 100644 --- a/source/de/anomic/yacy/yacySeedDB.java +++ b/source/de/anomic/yacy/yacySeedDB.java @@ -233,7 +233,7 @@ public class yacySeedDB { try { keyIt = seedActiveDB.keys(true, false); // iteration of String - Objects } catch (IOException e) { - yacyCore.log.logFailure("yacySeedCache.anySeed: seed.db not available: " + e.getMessage()); + yacyCore.log.logSevere("yacySeedCache.anySeed: seed.db not available: " + e.getMessage()); keyIt = (new HashSet()).iterator(); } String seedHash; diff --git a/source/yacy.java b/source/yacy.java index 2f69484c9..7ae6911f3 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -350,7 +350,7 @@ public final class yacy { server.setName("httpd:"+port); server.setPriority(Thread.MAX_PRIORITY); if (server == null) { - serverLog.logFailure("STARTUP", "Failed to start server. Probably port " + port + " already in use."); + serverLog.logSevere("STARTUP", "Failed to start server. Probably port " + port + " already in use."); } else { // first start the server sb.deployThread("10_httpd", "HTTPD Server/Proxy", "the HTTPD, used as web server and proxy", null, server, 0, 0, 0, 0); @@ -377,7 +377,7 @@ public final class yacy { } serverLog.logInfo("STARTUP", "Copied the default lokales to DATA/LOCALE"); }catch(NullPointerException e){ - serverLog.logFailure("STARTUP", "Nullpointer Exception while copying the default Locales"); + serverLog.logSevere("STARTUP", "Nullpointer Exception while copying the default Locales"); } //regenerate Locales from Translationlist, if needed @@ -418,7 +418,7 @@ public final class yacy { try { sb.waitForShutdown(); } catch (Exception e) { - serverLog.logFailure("MAIN CONTROL LOOP", "PANIK: " + e.getMessage(),e); + serverLog.logSevere("MAIN CONTROL LOOP", "PANIK: " + e.getMessage(),e); } // shut down @@ -440,11 +440,11 @@ public final class yacy { sb.close(); } } catch (Exception e) { - serverLog.logFailure("STARTUP", "Unexpected Error: " + e.getClass().getName(),e); + serverLog.logSevere("STARTUP", "Unexpected Error: " + e.getClass().getName(),e); //System.exit(1); } } catch (Exception ee) { - serverLog.logFailure("STARTUP", "FATAL ERROR: " + ee.getMessage(),ee); + serverLog.logSevere("STARTUP", "FATAL ERROR: " + ee.getMessage(),ee); } serverLog.logConfig("SHUTDOWN", "goodbye. (this is the last line)"); try { @@ -468,7 +468,7 @@ public final class yacy { // read data folder File dataFolder = new File(homePath, "DATA"); if (!(dataFolder.exists())) { - serverLog.logFailure(mes, "Application was never started or root path wrong."); + serverLog.logSevere(mes, "Application was never started or root path wrong."); System.exit(-1); } @@ -476,10 +476,10 @@ public final class yacy { try { config.load(new FileInputStream(new File(homePath, "DATA/SETTINGS/httpProxy.conf"))); } catch (FileNotFoundException e) { - serverLog.logFailure(mes, "could not find configuration file."); + serverLog.logSevere(mes, "could not find configuration file."); System.exit(-1); } catch (IOException e) { - serverLog.logFailure(mes, "could not read configuration file."); + serverLog.logSevere(mes, "could not read configuration file."); System.exit(-1); } @@ -521,11 +521,11 @@ public final class yacy { res.writeContent(bos, null); con.close(); } else { - serverLog.logFailure("REMOTE-SHUTDOWN", "error response from YACY socket: " + res.status); + serverLog.logSevere("REMOTE-SHUTDOWN", "error response from YACY socket: " + res.status); System.exit(-1); } } catch (IOException e) { - serverLog.logFailure("REMOTE-SHUTDOWN", "could not establish connection to YACY socket: " + e.getMessage()); + serverLog.logSevere("REMOTE-SHUTDOWN", "could not establish connection to YACY socket: " + e.getMessage()); System.exit(-1); } @@ -708,7 +708,7 @@ public final class yacy { serverLog.logInfo("CLEAN-WORDLIST", "not necessary to change wordlist"); } } catch (IOException e) { - serverLog.logFailure("CLEAN-WORDLIST", "ERROR: " + e.getMessage()); + serverLog.logSevere("CLEAN-WORDLIST", "ERROR: " + e.getMessage()); System.exit(-1); } @@ -832,7 +832,7 @@ class shutdownHookThread extends Thread { this.mainThread.join(); } } catch (Exception e) { - serverLog.logFailure("SHUTDOWN","Unexpected error. " + e.getClass().getName(),e); + serverLog.logSevere("SHUTDOWN","Unexpected error. " + e.getClass().getName(),e); } } }