Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions src/main/java/org/jboss/aesh/util/LoggerUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,30 @@ public class LoggerUtil {
*/
public static synchronized Logger getLogger(String name) {
if(logHandler == null) {
try {
File logFile = new File(Settings.getInstance().getLogFile());
if(logFile.getParentFile() != null && !logFile.getParentFile().isDirectory()) {
if(!logFile.getParentFile().mkdirs()) {
//if creating dirs failed, just create a logger without a file handler
return Logger.getLogger(name);
if (!Settings.getInstance().isLogging()) {
logHandler = new ConsoleHandler();
logHandler.setFormatter(new SimpleFormatter());
} else {
try {
File logFile = new File(Settings.getInstance().getLogFile());
if(logFile.getParentFile() != null && !logFile.getParentFile().isDirectory()) {
if(!logFile.getParentFile().mkdirs()) {
//if creating dirs failed, just create a logger without a file handler
return Logger.getLogger(name);
}
}
else if(logFile.isDirectory()) {
Settings.getInstance().setLogFile(Settings.getInstance().getLogFile() + Config.getPathSeparator() + "aesh.log");
}
logHandler = new FileHandler(Settings.getInstance().getLogFile());
logHandler.setFormatter(new SimpleFormatter());
}
else if(logFile.isDirectory()) {
Settings.getInstance().setLogFile(Settings.getInstance().getLogFile()+ Config.getPathSeparator()+"aesh.log");
catch (IOException e) {
//just use a consolehandler, set level to severe..
logHandler = new ConsoleHandler();
logHandler.setFormatter(new SimpleFormatter());
logHandler.setLevel(Level.SEVERE);
}
logHandler = new FileHandler(Settings.getInstance().getLogFile());
logHandler.setFormatter(new SimpleFormatter());
}
catch (IOException e) {
//just use a consolehandler, set level to severe..
logHandler = new ConsoleHandler();
logHandler.setFormatter(new SimpleFormatter());
logHandler.setLevel(Level.SEVERE);
}
}

Expand Down