boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

replaced usage of log4j by ConcurrentLog where possible

Browse Source
pull/1/head
Michael Peter Christen 12 years ago
parent 5878c1d599
commit 5c6946dd5f
16 changed files with 37 additions and 51 deletions
Show Stats Download Patch File Download Diff File

5
source/net/yacy/cora/document/WordCache.java
Unescape View File

@ -38,9 +38,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.zip.GZIPInputStream;
import org.apache.log4j.Logger;
import net.yacy.cora.sorting.OrderedScoreMap;
import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.StringBuilderComparator;
/**
@ -49,7 +48,7 @@ import net.yacy.cora.util.StringBuilderComparator;
*/
public class WordCache {
private final static Logger log = Logger.getLogger(WordCache.class);
private final static ConcurrentLog log = new ConcurrentLog(WordCache.class.getName());
// common word cache
private static final int commonWordsMaxSize = 20000; // maximum size of common word cache

4
source/net/yacy/cora/federate/solr/SchemaConfiguration.java
Unescape View File

@ -29,13 +29,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrInputDocument;
import net.yacy.cora.document.ASCII;
import net.yacy.cora.storage.Configuration;
import net.yacy.cora.storage.HandleSet;
import net.yacy.cora.util.ConcurrentLog;
import net.yacy.kelondro.data.meta.DigestURI;
import net.yacy.search.index.Segment;
import net.yacy.search.index.Segment.ReferenceReport;
@ -45,7 +45,7 @@ import net.yacy.search.schema.CollectionSchema;
public class SchemaConfiguration extends Configuration implements Serializable {
private final static long serialVersionUID=-5961730809008841258L;
private final static Logger log = Logger.getLogger(SchemaConfiguration.class);
private final static ConcurrentLog log = new ConcurrentLog(SchemaConfiguration.class.getName());
public SchemaConfiguration() {

2
source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java
Unescape View File

@ -194,7 +194,7 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo
try {
rsp = this.server.query(params);
if (q != null) Thread.currentThread().setName(threadname);
if (rsp != null) log.debug(rsp.getResults().getNumFound() + " results for q=" + q);
if (rsp != null) log.fine(rsp.getResults().getNumFound() + " results for q=" + q);
return rsp;
} catch (SolrServerException e) {
throw new IOException(e);

3
source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java
Unescape View File

@ -29,7 +29,6 @@ import java.util.List;
import net.yacy.cora.util.ConcurrentLog;
import net.yacy.search.schema.CollectionSchema;
import org.apache.log4j.Logger;
import org.apache.lucene.analysis.NumericTokenStream;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.client.solrj.SolrServer;
@ -42,7 +41,7 @@ import org.apache.solr.common.SolrInputDocument;
public abstract class SolrServerConnector extends AbstractSolrConnector implements SolrConnector {
protected final static Logger log = Logger.getLogger(SolrServerConnector.class);
protected final static ConcurrentLog log = new ConcurrentLog(SolrServerConnector.class.getName());
public final static NumericTokenStream classLoaderSynchro = new NumericTokenStream();
// pre-instantiate this object to prevent sun.misc.Launcher$AppClassLoader deadlocks
// this is a very nasty problem; solr instantiates objects dynamically which can cause deadlocks

5
source/net/yacy/cora/federate/yacy/Peers.java
Unescape View File

@ -29,12 +29,11 @@ import java.util.Random;
import java.util.Set;
import java.util.TreeMap;
import org.apache.log4j.Logger;
import net.yacy.cora.document.ASCII;
import net.yacy.cora.federate.yacy.api.Network;
import net.yacy.cora.order.Base64Order;
import net.yacy.cora.protocol.http.HTTPClient;
import net.yacy.cora.util.ConcurrentLog;
public class Peers extends TreeMap<byte[], Peer> implements Serializable {
@ -43,7 +42,7 @@ public class Peers extends TreeMap<byte[], Peer> implements Serializable {
"sokrates.homeunix.net:6070", "sokrates.homeunix.net:9090",
"141.52.175.27:8080", "62.75.214.113:8080", "141.52.175.30:8080"};
private final static Logger log = Logger.getLogger(Peers.class);
private final static ConcurrentLog log = new ConcurrentLog(Peers.class.getName());
private static final long serialVersionUID = -2939656606305545080L;
private long lastBootstrap;

5
source/net/yacy/cora/geo/GeonamesLocation.java
Unescape View File

@ -39,9 +39,8 @@ import java.util.TreeSet;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.apache.log4j.Logger;
import net.yacy.cora.document.WordCache;
import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.StringBuilderComparator;
public class GeonamesLocation implements Locations {
@ -69,7 +68,7 @@ public class GeonamesLocation implements Locations {
timezone : the timezone id (see file timeZone.txt)
modification date : date of last modification in yyyy-MM-dd format
*/
private final static Logger log = Logger.getLogger(GeonamesLocation.class);
private final static ConcurrentLog log = new ConcurrentLog(GeonamesLocation.class.getName());
private final Map<Integer, GeoLocation> id2loc;
private final TreeMap<StringBuilder, List<Integer>> name2ids;

5
source/net/yacy/cora/language/synonyms/AutotaggingLibrary.java
Unescape View File

@ -27,10 +27,9 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.log4j.Logger;
import net.yacy.cora.geo.Locations;
import net.yacy.cora.lod.vocabulary.Tagging;
import net.yacy.cora.util.ConcurrentLog;
/**
* Autotagging provides a set of tag/print-name properties which can be used to
@ -39,7 +38,7 @@ import net.yacy.cora.lod.vocabulary.Tagging;
*/
public class AutotaggingLibrary {
private final static Logger log = Logger.getLogger(AutotaggingLibrary.class);
private final static ConcurrentLog log = new ConcurrentLog(AutotaggingLibrary.class.getName());
private final static Object PRESENT = new Object();
private final File autotaggingPath;

5
source/net/yacy/cora/language/synonyms/SynonymLibrary.java
Unescape View File

@ -29,10 +29,9 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import org.apache.log4j.Logger;
import net.yacy.cora.storage.Files;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog;
/**
* Stemming library: reads stemming files and creates a mapping from words to synonyms
@ -43,7 +42,7 @@ import net.yacy.cora.util.CommonPattern;
*/
public class SynonymLibrary {
Logger log = Logger.getLogger(SynonymLibrary.class);
ConcurrentLog log = new ConcurrentLog(SynonymLibrary.class.getName());
private Map<String, List<Set<String>>> lib;
public SynonymLibrary(final File path) {

5
source/net/yacy/cora/lod/JenaTripleStore.java
Unescape View File

@ -20,10 +20,9 @@ import net.yacy.cora.lod.vocabulary.Geo;
import net.yacy.cora.lod.vocabulary.HttpHeader;
import net.yacy.cora.lod.vocabulary.Tagging;
import net.yacy.cora.lod.vocabulary.YaCyMetadata;
import net.yacy.cora.util.ConcurrentLog;
import net.yacy.search.Switchboard;
import org.apache.log4j.Logger;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Property;
@ -38,7 +37,7 @@ import com.hp.hpl.jena.util.FileManager;
public class JenaTripleStore {
private final static Logger log = Logger.getLogger(JenaTripleStore.class);
private final static ConcurrentLog log = new ConcurrentLog(JenaTripleStore.class.getName());
public static Model model = ModelFactory.createDefaultModel();
static {

5
source/net/yacy/cora/protocol/Domains.java
Unescape View File

@ -50,13 +50,12 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import org.apache.log4j.Logger;
import net.yacy.cora.plugin.ClassProvider;
import net.yacy.cora.storage.ARC;
import net.yacy.cora.storage.ConcurrentARC;
import net.yacy.cora.storage.KeyList;
import net.yacy.cora.util.CommonPattern;
import net.yacy.cora.util.ConcurrentLog;
import com.google.common.net.InetAddresses;
import com.google.common.util.concurrent.SimpleTimeLimiter;
@ -64,7 +63,7 @@ import com.google.common.util.concurrent.TimeLimiter;
public class Domains {
private final static Logger log = Logger.getLogger(Domains.class);
private final static ConcurrentLog log = new ConcurrentLog(Domains.class.getName());
public static final String LOCALHOST = "127.0.0.1"; // replace with IPv6 0:0:0:0:0:0:0:1 ?
private static String LOCALHOST_NAME = LOCALHOST; // this will be replaced with the actual name of the local host

7
source/net/yacy/cora/protocol/ResponseHeader.java
Unescape View File

@ -27,17 +27,16 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.apache.http.Header;
import org.apache.log4j.Logger;
import net.yacy.cora.util.ConcurrentLog;
import org.apache.http.Header;
public class ResponseHeader extends HeaderFramework {
// response header properties
private static final long serialVersionUID = 0L;
private static Logger log = Logger.getLogger(ResponseHeader.class);
private static ConcurrentLog log = new ConcurrentLog(ResponseHeader.class.getName());
public ResponseHeader(final int statusCode) {
super();

4
source/net/yacy/cora/protocol/TimeoutRequest.java
Unescape View File

@ -38,6 +38,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import net.yacy.cora.util.ConcurrentLog;
import jcifs.smb.SmbException;
import jcifs.smb.SmbFile;
@ -91,7 +93,7 @@ public class TimeoutRequest<E> {
throw new ExecutionException(e);
}
} catch (final OutOfMemoryError e) {
org.apache.log4j.Logger.getLogger(TimeoutRequest.class).warn("OutOfMemoryError / retry follows", e);
ConcurrentLog.warn(TimeoutRequest.class.getName(), "OutOfMemoryError / retry follows", e);
// in case that no memory is there to create a new native thread
try {
return this.call.call();

5
source/net/yacy/crawler/retrieval/URLRewriterLibrary.java
Unescape View File

@ -29,13 +29,12 @@ import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import net.yacy.cora.storage.Files;
import org.apache.log4j.Logger;
import net.yacy.cora.util.ConcurrentLog;
public class URLRewriterLibrary {
private final static Logger log = Logger.getLogger(URLRewriterLibrary.class);
private final static ConcurrentLog log = new ConcurrentLog(URLRewriterLibrary.class.getName());
private final File rewritingPath;
private final Map<Pattern, String> rewriters;

20
source/net/yacy/crawler/robots/RobotsTxt.java
Unescape View File

@ -38,6 +38,7 @@ import java.util.regex.Pattern;
import net.yacy.cora.document.MultiProtocolURI;
import net.yacy.cora.federate.yacy.CacheStrategy;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.util.ConcurrentLog;
import net.yacy.cora.util.SpaceExceededException;
import net.yacy.crawler.retrieval.Request;
import net.yacy.crawler.retrieval.Response;
@ -46,12 +47,9 @@ import net.yacy.kelondro.blob.BEncodedHeap;
import net.yacy.kelondro.data.meta.DigestURI;
import net.yacy.repository.LoaderDispatcher;
import org.apache.log4j.Logger;
public class RobotsTxt {
private static Logger log = Logger.getLogger(RobotsTxt.class);
private static ConcurrentLog log = new ConcurrentLog(RobotsTxt.class.getName());
protected static final String ROBOTS_DB_PATH_SEPARATOR = ";";
protected static final Pattern ROBOTS_DB_PATH_SEPARATOR_MATCHER = Pattern.compile(ROBOTS_DB_PATH_SEPARATOR);
@ -104,7 +102,7 @@ public class RobotsTxt {
try {
robotsTable = this.tables.getHeap(WorkTables.TABLE_ROBOTS_NAME);
} catch (IOException e1) {
log.fatal("tables not available", e1);
log.severe("tables not available", e1);
}
try {
record = robotsTable.get(robotsTable.encodedKey(urlHostPort));
@ -156,13 +154,13 @@ public class RobotsTxt {
try {
robotsURL = new DigestURI((urlHostPort.endsWith(":443") ? "https://" : "http://") + urlHostPort + "/robots.txt");
} catch (final MalformedURLException e) {
log.fatal("Unable to generate robots.txt URL for host:port '" + urlHostPort + "'.", e);
log.severe("Unable to generate robots.txt URL for host:port '" + urlHostPort + "'.", e);
robotsURL = null;
}
Response response = null;
if (robotsURL != null) {
if (log.isDebugEnabled()) log.debug("Trying to download the robots.txt file from URL '" + robotsURL + "'.");
if (log.isFine()) log.fine("Trying to download the robots.txt file from URL '" + robotsURL + "'.");
Request request = new Request(robotsURL, null);
try {
response = this.loader.load(request, CacheStrategy.NOCACHE, null, 0, 3000);
@ -191,7 +189,7 @@ public class RobotsTxt {
try {
robotsTable = this.tables.getHeap(WorkTables.TABLE_ROBOTS_NAME);
} catch (IOException e1) {
log.fatal("tables not available", e1);
log.severe("tables not available", e1);
return;
}
if (robotsTable == null || robotsTable.containsKey(robotsTable.encodedKey(urlHostPort))) return;
@ -212,13 +210,13 @@ public class RobotsTxt {
try {
robotsURL = new DigestURI((urlHostPort.endsWith(":443") ? "https://" : "http://") + urlHostPort + "/robots.txt");
} catch (final MalformedURLException e) {
log.fatal("Unable to generate robots.txt URL for host:port '" + urlHostPort + "'.", e);
log.severe("Unable to generate robots.txt URL for host:port '" + urlHostPort + "'.", e);
robotsURL = null;
}
Response response = null;
if (robotsURL != null) {
if (log.isDebugEnabled()) log.debug("Trying to download the robots.txt file from URL '" + robotsURL + "'.");
if (log.isFine()) log.fine("Trying to download the robots.txt file from URL '" + robotsURL + "'.");
Request request = new Request(robotsURL, null);
try {
response = RobotsTxt.this.loader.load(request, CacheStrategy.NOCACHE, null, 0, 3000);
@ -260,7 +258,7 @@ public class RobotsTxt {
final int sz = robotsTable.size();
addEntry(robotsTxt4Host);
if (robotsTable.size() <= sz) {
log.fatal("new entry in robots.txt table failed, resetting database");
log.severe("new entry in robots.txt table failed, resetting database");
try {clear();} catch (IOException e) {}
addEntry(robotsTxt4Host);
}

6
source/net/yacy/gui/framework/Switchboard.java
Unescape View File

@ -33,9 +33,7 @@ import java.util.concurrent.Semaphore;
import javax.swing.text.JTextComponent;
import org.apache.log4j.Logger;
import net.yacy.cora.util.ConcurrentLog;
/**
* a static class that holds application-wide parameters
@ -58,7 +56,7 @@ public class Switchboard {
*/
private static Properties properties = new Properties();
public static Logger log = Logger.getLogger(Switchboard.class);
public static ConcurrentLog log = new ConcurrentLog(Switchboard.class.getName());
public static void startInfoUpdater() {

2
source/net/yacy/kelondro/logging/SimpleLogFormatter.java
Unescape View File

@ -37,8 +37,6 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.SimpleFormatter;
import net.yacy.cora.util.ConcurrentLog;
public final class SimpleLogFormatter extends SimpleFormatter {

Write Preview
Loading…
Cancel
Save