Issue #2142 when logging internally, let loggers format message and stacktrace

Change-Id: I43bdbc6c96b7a57326fb652ed49e731ff0f90576

Former-commit-id: 113ea847bd [formerly 62cf4798a3] [formerly aa2336f598] [formerly aa2336f598 [formerly d919e08791]] [formerly 113ea847bd [formerly 62cf4798a3] [formerly aa2336f598] [formerly aa2336f598 [formerly d919e08791]] [formerly 6f8c9aea0d [formerly aa2336f598 [formerly d919e08791] [formerly 6f8c9aea0d [formerly 2de8d8d887a50747abc5d2d020b65f5c12dd819c]]]]]
Former-commit-id: 6f8c9aea0d
Former-commit-id: 7fde12824f [formerly bc4248a524] [formerly 893cba29b1] [formerly b395094ad5c5d0c4bb0183d236b9a113ecaa9408 [formerly 17d33d17e5d25c5124fc5140a9f54e67091cb928] [formerly 893cba29b1 [formerly c48c92477f]]]
Former-commit-id: a0a3721f6c31697bce8a33ca215ec4836b985b6e [formerly c853b3640b87d2ccd752632189b5f3923031fc13] [formerly 881ec9665e [formerly 5763edfd08]]
Former-commit-id: fe1432dd56d3b075b576960f5bbd63b7f18a7283 [formerly 881ec9665e]
Former-commit-id: b1757d06b0
This commit is contained in:
Nate Jensen 2013-08-27 14:53:29 -05:00
parent 7320c6f809
commit a0e5af5d1b

View file

@ -74,15 +74,21 @@ public class SystemStatusHandler extends AbstractStatusHandler {
final IStatus status = statusAdapter.getStatus();
StatusMessage sm = null;
String msg = null;
Throwable t = null;
if (status instanceof VizStatusInternal) {
VizStatusInternal vs = (VizStatusInternal) status;
msg = vs.getMessage();
t = vs.getException();
sm = vs.toStatusMessage();
} else {
sm = from(status);
msg = sm.getDetails();
}
Priority p = sm.getPriority();
try {
logStatus(sm);
logStatus(p, msg, t);
AlertVizClient.sendMessage(sm);
} catch (final AlertvizException e) {
// not a good situation, since we can't communicate with the log
@ -194,24 +200,23 @@ public class SystemStatusHandler extends AbstractStatusHandler {
return LogMessageDAO.getInstance().load(count, category);
}
private void logStatus(StatusMessage status) {
String msg = status.getDetails();
switch (status.getPriority()) {
private void logStatus(Priority priority, String message, Throwable t) {
switch (priority) {
case CRITICAL:
logger.error(FATAL, msg);
logger.error(FATAL, message, t);
break;
case SIGNIFICANT:
logger.error(msg);
logger.error(message, t);
break;
case PROBLEM:
logger.warn(msg);
logger.warn(message, t);
break;
case EVENTA: // fall through
case EVENTB:
logger.info(msg);
logger.info(message, t);
break;
case VERBOSE:
logger.debug(msg);
logger.debug(message, t);
break;
}
}