|
@@ -24,7 +24,6 @@ package com.dmdirc;
|
24
|
24
|
|
25
|
25
|
import com.dmdirc.commandparser.CommandType;
|
26
|
26
|
import com.dmdirc.config.profiles.Profile;
|
27
|
|
-import com.dmdirc.events.AppErrorEvent;
|
28
|
27
|
import com.dmdirc.events.ServerConnectErrorEvent;
|
29
|
28
|
import com.dmdirc.events.ServerConnectedEvent;
|
30
|
29
|
import com.dmdirc.events.ServerConnectingEvent;
|
|
@@ -39,7 +38,6 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
|
39
|
38
|
import com.dmdirc.interfaces.config.ConfigProvider;
|
40
|
39
|
import com.dmdirc.interfaces.config.ConfigProviderMigrator;
|
41
|
40
|
import com.dmdirc.interfaces.config.IdentityFactory;
|
42
|
|
-import com.dmdirc.logger.ErrorLevel;
|
43
|
41
|
import com.dmdirc.parser.common.DefaultStringConverter;
|
44
|
42
|
import com.dmdirc.parser.common.IgnoreList;
|
45
|
43
|
import com.dmdirc.parser.common.ParserError;
|
|
@@ -89,6 +87,7 @@ import javax.net.ssl.SSLException;
|
89
|
87
|
import org.slf4j.Logger;
|
90
|
88
|
import org.slf4j.LoggerFactory;
|
91
|
89
|
|
|
90
|
+import static com.dmdirc.util.LogUtils.APP_ERROR;
|
92
|
91
|
import static com.google.common.base.Preconditions.checkNotNull;
|
93
|
92
|
|
94
|
93
|
/**
|
|
@@ -252,9 +251,7 @@ public class Server extends FrameContainer implements Connection {
|
252
|
251
|
this.address = new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(),
|
253
|
252
|
pd.getDefaultPort(), uri.getPath(), uri.getQuery(), uri.getFragment());
|
254
|
253
|
} catch (URISyntaxException ex) {
|
255
|
|
- getEventBus().publish(
|
256
|
|
- new AppErrorEvent(ErrorLevel.MEDIUM, ex, "Unable to construct URI",
|
257
|
|
- ""));
|
|
254
|
+ LOG.warn(APP_ERROR, "Unable to construct URI", ex);
|
258
|
255
|
}
|
259
|
256
|
});
|
260
|
257
|
}
|
|
@@ -943,10 +940,8 @@ public class Server extends FrameContainer implements Connection {
|
943
|
940
|
|| exception instanceof SSLException) {
|
944
|
941
|
description = exception.getMessage();
|
945
|
942
|
} else {
|
946
|
|
- getEventBus().publish(new AppErrorEvent(ErrorLevel.LOW,
|
947
|
|
- new IllegalArgumentException(exception),
|
948
|
|
- "Unknown socket error: " + exception.getClass().getCanonicalName(),
|
949
|
|
- ""));
|
|
943
|
+ LOG.info(APP_ERROR, "Unknown socket error: {}",
|
|
944
|
+ exception.getClass().getCanonicalName(), exception);
|
950
|
945
|
description = "Unknown error: " + exception.getMessage();
|
951
|
946
|
}
|
952
|
947
|
}
|