Merge commit 'upstream/master~550' into merge_7_25

This commit is contained in:
Ryan Cavanaugh
2016-07-26 11:29:27 -07:00
73 changed files with 11351 additions and 1126 deletions

View File

@@ -5,6 +5,13 @@ function aSimpleLoggingMessageString() {
log.info("Hello World");
}
function compareLogLevelsAndLog() {
var log = log4javascript.getDefaultLogger();
if (log4javascript.Level.INFO.isGreaterOrEqual(log.getLevel())) {
log.log(log4javascript.Level.INFO, ["Info"]);
}
}
function loggingAnErrorWithAMessage() {
var log = log4javascript.getDefaultLogger();
try {