Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

changed logging to log4j

Browse source
This commit is contained in:
BetaSteward 2011-05-09 23:04:05 -04:00
parent 017b2b4339
commit da7e56aba1
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Common/src/mage/interfaces/callback/CallbackClientDaemon.java
View file

@ -31,9 +31,7 @@ package mage.interfaces.callback;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.logging.Level;
import java.util.logging.Logger;
import mage.util.Logging;
import org.apache.log4j.Logger;
/**
*
@ -41,7 +39,7 @@ import mage.util.Logging;
*/
public class CallbackClientDaemon extends Thread {
private final static Logger logger = Logging.getLogger(CallbackClientDaemon.class.getName());
private final static Logger logger = Logger.getLogger(CallbackClientDaemon.class);
private static ExecutorService callbackExecutor = Executors.newCachedThreadPool();
private final CallbackClient client;
@ -69,14 +67,14 @@ public class CallbackClientDaemon extends Thread {
client.processCallback(callback);
}
catch (Exception ex) {
logger.log(Level.SEVERE, null, ex);
logger.fatal("CallbackClientDaemon error ", ex);
}
}
}
);
}
} catch(Exception ex) {
logger.log(Level.SEVERE, null, ex);
logger.fatal("CallbackClientDaemon error ", ex);
}
}
}

11
Mage.Common/src/mage/interfaces/callback/CallbackServerSession.java
View file

@ -30,8 +30,7 @@ package mage.interfaces.callback;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Logger;
import mage.util.Logging;
import org.apache.log4j.Logger;
/**
*
@ -39,7 +38,7 @@ import mage.util.Logging;
*/
public class CallbackServerSession {
private final static Logger logger = Logging.getLogger(CallbackServerSession.class.getName());
private final static Logger logger = Logger.getLogger(CallbackServerSession.class);
private final ClientCallback callback = new ClientCallback();
private final ReentrantLock lock = new ReentrantLock();
@ -60,11 +59,11 @@ public class CallbackServerSession {
waitingForCallback = true;
waiting.signal();
while (callback.getMethod() == null) {
logger.finer("waiting for callback");
logger.trace("waiting for callback");
callbackCalled.await();
}
waitingForCallback = false;
logger.finer("callback called:" + callback.getMethod());
logger.trace("callback called:" + callback.getMethod());
return callback;
}
finally {
@ -82,7 +81,7 @@ public class CallbackServerSession {
lock.lock();
try {
while (!waitingForCallback) {
logger.finer("waiting for callback state to call:" + call.getMethod());
logger.trace("waiting for callback state to call:" + call.getMethod());
waiting.await();
}
callback.setMethod(call.getMethod());