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

better logging in logger

Browse Source
pull/1/head
Michael Peter Christen 11 years ago
parent a5d7961812
commit ec10ed45bd
2 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File

75
source/net/yacy/cora/util/ConcurrentLog.java
Unescape View File

@ -46,13 +46,21 @@ import java.util.logging.Logger;
*/ */
public final class ConcurrentLog { public final class ConcurrentLog {
private final static Logger ConcurrentLogLogger = Logger.getLogger("ConcurrentLog");
private final static Message POISON_MESSAGE = new Message(); private final static Message POISON_MESSAGE = new Message();
private final static BlockingQueue<Message> logQueue = new ArrayBlockingQueue<Message>(300); private final static BlockingQueue<Message> logQueue = new ArrayBlockingQueue<Message>(500);
private final static Worker logRunnerThread = new Worker(); private static Worker logRunnerThread = null;
static { static {
ensureWorkerIsRunning();
}
public static void ensureWorkerIsRunning() {
if (logRunnerThread == null || !logRunnerThread.isAlive()) {
logRunnerThread = new Worker();
logRunnerThread.start(); logRunnerThread.start();
ConcurrentLogLogger.log(Level.INFO, "started ConcurrentLog.Worker.");
}
} }
private final Logger theLogger; private final Logger theLogger;
@ -166,11 +174,17 @@ public final class ConcurrentLog {
return this.theLogger.isLoggable(level); return this.theLogger.isLoggable(level);
} }
/*
public final void logException(final Throwable thrown) {
if (thrown == null) return;
enQueueLog(this.theLogger, Level.WARNING, thrown.getMessage(), thrown);
}
*/
// static log messages // static log messages
public final static void logException(final Throwable thrown) { public final static void logException(final Throwable thrown) {
if (thrown == null) return; if (thrown == null) return;
enQueueLog("StackTrace", Level.WARNING, thrown.getMessage(), thrown); enQueueLog("ConcurrentLog", Level.WARNING, thrown.getMessage(), thrown);
} }
public final static void severe(final String appName, final String message) { public final static void severe(final String appName, final String message) {
enQueueLog(appName, Level.SEVERE, message); enQueueLog(appName, Level.SEVERE, message);
@ -234,10 +248,11 @@ public final class ConcurrentLog {
return Logger.getLogger(appName).isLoggable(Level.FINEST); return Logger.getLogger(appName).isLoggable(Level.FINEST);
} }
// private
private final static void enQueueLog(final Logger logger, final Level level, final String message, final Throwable thrown) { private final static void enQueueLog(final Logger logger, final Level level, final String message, final Throwable thrown) {
if (!logger.isLoggable(level)) return; if (!logger.isLoggable(level)) return;
if (logRunnerThread == null || !logRunnerThread.isAlive()) { if (logRunnerThread == null || !logRunnerThread.isAlive()) {
if (thrown == null) logger.log(level, message); else logger.log(level, message, thrown); if (thrown == null) logger.log(level, "* " + message); else logger.log(level, "* " + message, thrown); // the * is inefficient, but should show up only in emergency cases
} else { } else {
try { try {
if (thrown == null) logQueue.put(new Message(logger, level, message)); else logQueue.put(new Message(logger, level, message, thrown)); if (thrown == null) logQueue.put(new Message(logger, level, message)); else logQueue.put(new Message(logger, level, message, thrown));
@ -250,7 +265,7 @@ public final class ConcurrentLog {
private final static void enQueueLog(final Logger logger, final Level level, final String message) { private final static void enQueueLog(final Logger logger, final Level level, final String message) {
if (!logger.isLoggable(level)) return; if (!logger.isLoggable(level)) return;
if (logRunnerThread == null || !logRunnerThread.isAlive()) { if (logRunnerThread == null || !logRunnerThread.isAlive()) {
logger.log(level, message); logger.log(level, "* " + message); // the * is inefficient, but should show up only in emergency cases
} else { } else {
try { try {
logQueue.put(new Message(logger, level, message)); logQueue.put(new Message(logger, level, message));
@ -262,7 +277,7 @@ public final class ConcurrentLog {
private final static void enQueueLog(final String loggername, final Level level, final String message, final Throwable thrown) { private final static void enQueueLog(final String loggername, final Level level, final String message, final Throwable thrown) {
if (logRunnerThread == null || !logRunnerThread.isAlive()) { if (logRunnerThread == null || !logRunnerThread.isAlive()) {
if (thrown == null) Logger.getLogger(loggername).log(level, message); else Logger.getLogger(loggername).log(level, message, thrown); if (thrown == null) Logger.getLogger(loggername).log(level, "* " + message); else Logger.getLogger(loggername).log(level, "* " + message, thrown); // the * is inefficient, but should show up only in emergency cases
} else { } else {
try { try {
if (thrown == null) logQueue.put(new Message(loggername, level, message)); else logQueue.put(new Message(loggername, level, message, thrown)); if (thrown == null) logQueue.put(new Message(loggername, level, message)); else logQueue.put(new Message(loggername, level, message, thrown));
@ -274,7 +289,7 @@ public final class ConcurrentLog {
private final static void enQueueLog(final String loggername, final Level level, final String message) { private final static void enQueueLog(final String loggername, final Level level, final String message) {
if (logRunnerThread == null || !logRunnerThread.isAlive()) { if (logRunnerThread == null || !logRunnerThread.isAlive()) {
Logger.getLogger(loggername).log(level, message); Logger.getLogger(loggername).log(level, "* " + message); // the * is inefficient, but should show up only in emergency cases
} else { } else {
try { try {
logQueue.put(new Message(loggername, level, message)); logQueue.put(new Message(loggername, level, message));
@ -336,14 +351,10 @@ public final class ConcurrentLog {
public void run() { public void run() {
Message entry; Message entry;
Map<String, Logger> loggerCache = new HashMap<String, Logger>(); Map<String, Logger> loggerCache = new HashMap<String, Logger>();
//Map<String, AtomicInteger> loggerCounter = new HashMap<String, AtomicInteger>();
try { try {
while ((entry = logQueue.take()) != POISON_MESSAGE) { while ((entry = logQueue.take()) != POISON_MESSAGE) {
if (entry.logger == null) { if (entry.logger == null) {
assert entry.loggername != null; assert entry.loggername != null;
//AtomicInteger i = loggerCounter.get(entry.loggername);
//if (i == null) {i = new AtomicInteger(0); loggerCounter.put(entry.loggername, i);}
//i.incrementAndGet();
Logger l = loggerCache.get(entry.loggername); Logger l = loggerCache.get(entry.loggername);
if (l == null) {l = Logger.getLogger(entry.loggername); loggerCache.put(entry.loggername, l);} if (l == null) {l = Logger.getLogger(entry.loggername); loggerCache.put(entry.loggername, l);}
if (entry.thrown == null) { if (entry.thrown == null) {
@ -360,10 +371,10 @@ public final class ConcurrentLog {
} }
} }
} }
} catch (final InterruptedException e) { } catch (final Throwable e) {
ConcurrentLog.logException(e); ConcurrentLogLogger.log(Level.SEVERE, "ConcurrentLog.Worker has terminated", e);
} }
//Logger.getLogger("Log").log(Level.INFO, "closing logRunner with cached loggers: " + loggerCounter.entrySet().toString()); ConcurrentLogLogger.log(Level.INFO, "terminating ConcurrentLog.Worker with " + logQueue.size() + " cached loglines.");
} }
} }
@ -408,9 +419,11 @@ public final class ConcurrentLog {
e.printStackTrace(ps); e.printStackTrace(ps);
ps.close(); ps.close();
exceptionLog.severe(msg + "\n" + baos.toString(), e); exceptionLog.severe(msg + "\n" + baos.toString(), e);
ConcurrentLog.logException(e); ConcurrentLogLogger.log(Level.SEVERE, e.getMessage(), e);
ConcurrentLog.logException(e.getCause()); if (e instanceof InvocationTargetException) {
if (e instanceof InvocationTargetException) ConcurrentLog.logException(((InvocationTargetException) e).getTargetException()); Throwable target = ((InvocationTargetException) e).getTargetException();
ConcurrentLogLogger.log(Level.SEVERE, target.getMessage(), target);
}
} }
}); });
} finally { } finally {
@ -419,31 +432,19 @@ public final class ConcurrentLog {
} }
public final static void shutdown() { public final static void shutdown() {
if (logRunnerThread == null || !logRunnerThread.isAlive()) return; if (logRunnerThread == null || !logRunnerThread.isAlive()) {
ConcurrentLogLogger.log(Level.INFO, "shutdown of ConcurrentLog.Worker void because it was not running.");
return;
}
try { try {
ConcurrentLogLogger.log(Level.INFO, "shutdown of ConcurrentLog.Worker: injection of poison message");
logQueue.put(POISON_MESSAGE); logQueue.put(POISON_MESSAGE);
logRunnerThread.join(1000); logRunnerThread.join(2000);
ConcurrentLogLogger.log(Level.INFO, "shutdown of ConcurrentLog.Worker: terminated");
} catch (final InterruptedException e) { } catch (final InterruptedException e) {
} }
} }
public final static String format(final String s, int n, final int fillChar) {
final int l = s.length();
if (l >= n) return s;
final StringBuilder sb = new StringBuilder(l + n);
for (final int i = l + n; i > n; n--) sb.insert(0, fillChar);
return sb.toString();
}
public final static boolean allZero(final byte[] a) {
return allZero(a, 0, a.length);
}
public final static boolean allZero(final byte[] a, final int astart, final int alength) {
for (int i = 0; i < alength; i++) if (a[astart + i] != 0) return false;
return true;
}
public static String stackTrace() { public static String stackTrace() {
Throwable t = new Throwable(); Throwable t = new Throwable();
StackTraceElement[] e = t.getStackTrace(); StackTraceElement[] e = t.getStackTrace();

9
source/net/yacy/kelondro/index/RowCollection.java
Unescape View File

@ -400,7 +400,7 @@ public class RowCollection implements Sortable<Row.Entry>, Iterable<Row.Entry>,
private final void addUnique(final byte[] a, final int astart, final int alength) throws SpaceExceededException { private final void addUnique(final byte[] a, final int astart, final int alength) throws SpaceExceededException {
assert (a != null); assert (a != null);
assert (astart >= 0) && (astart < a.length) : " astart = " + astart; assert (astart >= 0) && (astart < a.length) : " astart = " + astart;
assert (!(ConcurrentLog.allZero(a, astart, alength))) : "a = " + NaturalOrder.arrayList(a, astart, alength); assert (!(allZero(a, astart, alength))) : "a = " + NaturalOrder.arrayList(a, astart, alength);
assert (alength > 0); assert (alength > 0);
assert (astart + alength <= a.length); assert (astart + alength <= a.length);
assert alength == this.rowdef.objectsize : "alength =" + alength + ", rowdef.objectsize = " + this.rowdef.objectsize; assert alength == this.rowdef.objectsize : "alength =" + alength + ", rowdef.objectsize = " + this.rowdef.objectsize;
@ -424,7 +424,7 @@ public class RowCollection implements Sortable<Row.Entry>, Iterable<Row.Entry>,
protected final void addSorted(final byte[] a, final int astart, final int alength) throws SpaceExceededException { protected final void addSorted(final byte[] a, final int astart, final int alength) throws SpaceExceededException {
assert (a != null); assert (a != null);
assert (astart >= 0) && (astart < a.length) : " astart = " + astart; assert (astart >= 0) && (astart < a.length) : " astart = " + astart;
assert (!(ConcurrentLog.allZero(a, astart, alength))) : "a = " + NaturalOrder.arrayList(a, astart, alength); assert (!(allZero(a, astart, alength))) : "a = " + NaturalOrder.arrayList(a, astart, alength);
assert (alength > 0); assert (alength > 0);
assert (astart + alength <= a.length); assert (astart + alength <= a.length);
assert alength == this.rowdef.objectsize : "alength =" + alength + ", rowdef.objectsize = " + this.rowdef.objectsize; assert alength == this.rowdef.objectsize : "alength =" + alength + ", rowdef.objectsize = " + this.rowdef.objectsize;
@ -436,6 +436,11 @@ public class RowCollection implements Sortable<Row.Entry>, Iterable<Row.Entry>,
this.lastTimeWrote = System.currentTimeMillis(); this.lastTimeWrote = System.currentTimeMillis();
} }
private final static boolean allZero(final byte[] a, final int astart, final int alength) {
for (int i = 0; i < alength; i++) if (a[astart + i] != 0) return false;
return true;
}
public synchronized final void addAllUnique(final RowCollection c) throws SpaceExceededException { public synchronized final void addAllUnique(final RowCollection c) throws SpaceExceededException {
if (c == null) return; if (c == null) return;
assert(this.rowdef.objectsize == c.rowdef.objectsize); assert(this.rowdef.objectsize == c.rowdef.objectsize);

Write Preview
Loading…
Cancel
Save