Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeloffner committed Nov 15, 2023
1 parent 6cd7113 commit cb56f9d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 1 addition & 2 deletions core/src/main/java/lucee/runtime/config/ConfigImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
import lucee.commons.lang.types.RefBoolean;
import lucee.commons.net.IPRange;
import lucee.loader.engine.CFMLEngine;
import lucee.loader.util.Util;
import lucee.runtime.CIPage;
import lucee.runtime.Component;
import lucee.runtime.Mapping;
Expand Down Expand Up @@ -3980,7 +3979,7 @@ protected void setPreciseMath(boolean preciseMath) {
}

protected void setMainLogger(String mainLoggerName) {
if (!Util.isEmpty(mainLoggerName, true)) this.mainLoggerName = mainLoggerName.trim();
if (!StringUtil.isEmpty(mainLoggerName, true)) this.mainLoggerName = mainLoggerName.trim();
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import org.xml.sax.SAXException;

import lucee.Info;
import lucee.print;
import lucee.commons.collection.MapFactory;
import lucee.commons.date.TimeZoneConstants;
import lucee.commons.date.TimeZoneUtil;
Expand All @@ -83,7 +84,6 @@
import lucee.commons.lang.StringUtil;
import lucee.commons.net.URLDecoder;
import lucee.loader.engine.CFMLEngine;
import lucee.loader.util.Util;
import lucee.runtime.CFMLFactoryImpl;
import lucee.runtime.Component;
import lucee.runtime.Mapping;
Expand Down Expand Up @@ -2026,15 +2026,15 @@ private static void _loadLoggers(ConfigServerImpl configServer, ConfigImpl confi

// main logger
String mainLogger = ConfigWebUtil.getAsString("mainLogger", root, null);
if (!Util.isEmpty(mainLogger, true)) {
if (!StringUtil.isEmpty(mainLogger, true)) {
config.setMainLogger(mainLogger.trim());
}
else if (hasCS) {
config.setMainLogger(configServer.getMainLogger());
}
else {
mainLogger = SystemUtil.getSystemPropOrEnvVar("lucee.logging.main", null);
if (Util.isEmpty(mainLogger, true)) config.setMainLogger(mainLogger.trim());
if (StringUtil.isEmpty(mainLogger, true)) config.setMainLogger(mainLogger.trim());
}

// loggers
Expand Down Expand Up @@ -2119,6 +2119,7 @@ else if (!cdLayout.isBundle()) {
}
}
catch (Throwable t) {
print.e(t);
ExceptionUtil.rethrowIfNecessary(t);
log(config, null, t);
}
Expand Down

0 comments on commit cb56f9d

Please sign in to comment.