Skip to content

Commit f205f26

Browse files
committed
fix logger initialization problem
1 parent d540936 commit f205f26

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

org.erlide.core/src/org/erlide/core/ErlangPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ public void stop(final BundleContext context) throws Exception {
137137
public void start(final BundleContext context) throws Exception {
138138
String dir = ResourcesPlugin.getWorkspace().getRoot().getLocation()
139139
.toPortableString();
140-
logger = ErlLogger.init(dir, Platform.inDebugMode());
140+
logger = ErlLogger.getInstance();
141+
logger.setLogDir(dir);
141142
ErlLogger.debug("Starting CORE " + Thread.currentThread());
142143
super.start(context);
143144

org.erlide.jinterface/src/org/erlide/jinterface/util/ErlLogger.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,21 @@ public class ErlLogger {
2828
public static final String ERLIDE_GLOBAL_TRACE_OPTION = "org.erlide.launching/debug";
2929
private static ErlLogger instance;
3030
private Logger logger;
31-
private final String logDir;
31+
private String logDir;
3232

3333
public static ErlLogger getInstance() {
34+
if (instance == null) {
35+
instance = new ErlLogger(".");
36+
}
3437
return instance;
3538
}
3639

3740
public void dispose() {
3841
logger = null;
3942
}
4043

41-
public static ErlLogger init(final String dir, final boolean debug) {
42-
instance = new ErlLogger(dir, debug);
43-
return instance;
44+
public final void setLogDir(final String dir) {
45+
logDir = (dir == null) ? "./" : dir;
4446
}
4547

4648
public String getLogLocation() {
@@ -109,24 +111,22 @@ public static void error(final Throwable exception) {
109111
getInstance().log(Level.SEVERE, exception);
110112
}
111113

112-
private ErlLogger(String dir, boolean debug) {
114+
private ErlLogger(String dir) {
113115
final ErlSimpleFormatter erlSimpleFormatter = new ErlSimpleFormatter();
114116
logger = Logger.getLogger("org.erlide");
115-
logDir = dir == null ? "./" : dir;
116117

118+
setLogDir(dir);
117119
addFileHandler(erlSimpleFormatter);
118-
addConsoleHandler(debug, erlSimpleFormatter);
120+
addConsoleHandler(erlSimpleFormatter);
119121

120122
logger.setUseParentHandlers(false);
121123
logger.setLevel(java.util.logging.Level.FINEST);
122124
}
123125

124-
private void addConsoleHandler(boolean debug,
125-
final ErlSimpleFormatter erlSimpleFormatter) {
126+
private void addConsoleHandler(final ErlSimpleFormatter erlSimpleFormatter) {
126127
final ConsoleHandler consoleHandler = new ConsoleHandler();
127128
consoleHandler.setFormatter(erlSimpleFormatter);
128-
final Level lvl = debug ? java.util.logging.Level.FINEST
129-
: java.util.logging.Level.CONFIG;
129+
final Level lvl = java.util.logging.Level.FINEST;
130130
consoleHandler.setLevel(lvl);
131131
logger.addHandler(consoleHandler);
132132
}

0 commit comments

Comments
 (0)