Slf4j logging a few more things.

src/com/dmdirc/ClientModule.java

@@ -107,8 +107,8 @@ public class ClientModule {
 
     @Provides
     @Named("errors")
-    public ExecutorService getExecutorService(final DMDircMBassador eventBus) {
-        return new LoggingExecutorService(1, 1, eventBus, "Error Logging");
+    public ExecutorService getExecutorService() {
+        return new LoggingExecutorService(1, 1, "Error Logging");
     }
 
     @Provides

src/com/dmdirc/ui/messages/UiMessagesModule.java

@@ -23,7 +23,6 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 
 import java.nio.file.Path;
@@ -45,11 +44,9 @@ public class UiMessagesModule {
     @Singleton
     public EventFormatProvider getTemplateProvider(
             @Directory(BASE) final Path directory,
-            @GlobalConfig final ColourManager colourManager,
-            final DMDircMBassador eventBus) {
+            @GlobalConfig final ColourManager colourManager) {
         final YamlEventFormatProvider provider =
-                new YamlEventFormatProvider(directory.resolve("format.yml"), eventBus,
-                        colourManager);
+                new YamlEventFormatProvider(directory.resolve("format.yml"), colourManager);
         provider.load();
         return provider;
     }

src/com/dmdirc/ui/messages/YamlEventFormatProvider.java

@@ -22,10 +22,7 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.events.DisplayableEvent;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.colours.Colour;
 
 import java.io.IOException;
@@ -37,8 +34,13 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.esotericsoftware.yamlbeans.YamlReader;
 
+import static com.dmdirc.util.LogUtils.FATAL_APP_ERROR;
+import static com.dmdirc.util.LogUtils.USER_ERROR;
 import static com.dmdirc.util.YamlReaderUtils.asMap;
 
 /**
@@ -46,18 +48,17 @@ import static com.dmdirc.util.YamlReaderUtils.asMap;
  */
 public class YamlEventFormatProvider implements EventFormatProvider {
 
+    private static final Logger LOG = LoggerFactory.getLogger(YamlEventFormatProvider.class);
+
     /** The charset to use when reading and writing files. */
     private static final String CHARSET = "UTF-8";
 
     private final Path path;
-    private final DMDircMBassador eventBus;
     private final ColourManager colourManager;
     private final Map<String, EventFormat> formats = new HashMap<>();
 
-    public YamlEventFormatProvider(final Path path, final DMDircMBassador eventBus,
-            final ColourManager colourManager) {
+    public YamlEventFormatProvider(final Path path, final ColourManager colourManager) {
         this.path = path;
-        this.eventBus = eventBus;
         this.colourManager = colourManager;
     }
 
@@ -67,16 +68,14 @@ public class YamlEventFormatProvider implements EventFormatProvider {
         try (final InputStream stream = getClass().getResourceAsStream("format.yml")) {
             load(stream);
         } catch (IOException e) {
-            eventBus.publishAsync(new AppErrorEvent(ErrorLevel.FATAL, e,
-                    "Unable to load default event templates", ""));
+            LOG.error(FATAL_APP_ERROR, "Unable to load default event templates", e);
         }
 
         if (Files.exists(path)) {
             try (final InputStream stream = Files.newInputStream(path)) {
                 load(stream);
             } catch (IOException e) {
-                eventBus.publishAsync(new AppErrorEvent(ErrorLevel.LOW, e,
-                        "Unable to load event templates", ""));
+                LOG.info(USER_ERROR, "Unable to load event templates from {}", path, e);
             }
         }
     }

src/com/dmdirc/util/LoggingExecutorService.java

@@ -22,10 +22,6 @@
 
 package com.dmdirc.util;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.AppErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
-
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import java.util.concurrent.ArrayBlockingQueue;
@@ -36,12 +32,19 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.APP_ERROR;
+
 /**
  * An executor service that takes logs failed executions either via eventbus errors or a custom
  * error function.
  */
 public class LoggingExecutorService extends ThreadPoolExecutor {
 
+    private static final Logger LOG = LoggerFactory.getLogger(LoggingExecutorService.class);
+
     private final BiConsumer<Runnable, Throwable> afterExecute;
 
     /**
@@ -50,13 +53,10 @@ public class LoggingExecutorService extends ThreadPoolExecutor {
      * @param coreSize The number of threads to keep in the pool, even if they are idle, unless
      *                 {@code allowCoreThreadTimeOut} is set
      * @param maxSize  The maximum number of threads to allow in the pool
-     * @param eventBus The event bus to raise errors on
      * @param poolName The naming format to use when naming threads
      */
-    public LoggingExecutorService(final int coreSize, final int maxSize,
-            final DMDircMBassador eventBus, final String poolName) {
-        this(coreSize, maxSize, (r, t) -> eventBus.publishAsync(
-                new AppErrorEvent(ErrorLevel.HIGH, t, t.getMessage(), "")), poolName);
+    public LoggingExecutorService(final int coreSize, final int maxSize, final String poolName) {
+        this(coreSize, maxSize, (r, t) -> LOG.error(APP_ERROR, t.getMessage(), t), poolName);
     }
 
     /**

src/com/dmdirc/util/LoggingScheduledExecutorService.java

@@ -22,10 +22,6 @@
 
 package com.dmdirc.util;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.AppErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
-
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import java.util.concurrent.CancellationException;
@@ -34,12 +30,19 @@ import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.function.BiConsumer;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.APP_ERROR;
+
 /**
  * An scheduled executor service that takes logs failed executions either via eventbus errors or a
  * custom error function.
  */
 public class LoggingScheduledExecutorService extends ScheduledThreadPoolExecutor {
 
+    private static final Logger LOG = LoggerFactory.getLogger(LoggingScheduledExecutorService.class);
+
     private final BiConsumer<Runnable, Throwable> afterExecute;
 
     /**
@@ -47,13 +50,10 @@ public class LoggingScheduledExecutorService extends ScheduledThreadPoolExecutor
      *
      * @param coreSize The number of threads to keep in the pool, even if they are idle, unless
      *                 {@code allowCoreThreadTimeOut} is set
-     * @param eventBus The event bus to raise errors on
      * @param poolName The naming format to use when naming threads
      */
-    public LoggingScheduledExecutorService(final int coreSize,
-            final DMDircMBassador eventBus, final String poolName) {
-        this(coreSize, (r, t) -> eventBus
-                .publishAsync(new AppErrorEvent(ErrorLevel.HIGH, t, t.getMessage(), "")), poolName);
+    public LoggingScheduledExecutorService(final int coreSize, final String poolName) {
+        this(coreSize, (r, t) -> LOG.error(APP_ERROR, t.getMessage(), t), poolName);
     }
 
     /**