Tidy up a little in logger.

src/com/dmdirc/config/ConfigModule.java

@@ -69,8 +69,7 @@ public class ConfigModule {
             final ErrorManager errorManager) {
         final IdentityManager identityManager = new IdentityManager(baseDirectory,
                 identitiesDirectory, eventBus, clientInfo);
-        errorManager.initialise(identityManager.getGlobalConfiguration(), errorsDirectory,
-                eventBus, clientInfo);
+        errorManager.initialise(identityManager.getGlobalConfiguration(), errorsDirectory, eventBus);
         identityManager.loadVersionIdentity();
 
         try {

src/com/dmdirc/logger/ErrorManager.java

@@ -31,7 +31,6 @@ import com.dmdirc.events.ProgramErrorDeletedEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.FatalErrorDialog;
-import com.dmdirc.util.ClientInfo;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -76,6 +75,8 @@ public class ErrorManager {
     private final ListenerList errorListeners = new ListenerList();
     /** Countdown latch to wait for FED with. */
     private final CountDownLatch countDownLatch;
+    /** Sentry error reporter factory. */
+    private final SentryErrorReporter sentryErrorReporter;
     /** Event bus to subscribe and publish errors on. */
     private DMDircMBassador eventBus;
     /** Whether or not to send error reports. */
@@ -92,13 +93,13 @@ public class ErrorManager {
     private ExecutorService reportThread;
     /** Directory to store errors in. */
     private Path errorsDirectory;
-    private ClientInfo clientInfo;
 
     /** Creates a new instance of ErrorListDialog. */
     @Inject
-    public ErrorManager() {
+    public ErrorManager(final SentryErrorReporter sentryErrorReporter) {
         errors = new LinkedList<>();
         countDownLatch = new CountDownLatch(2);
+        this.sentryErrorReporter = sentryErrorReporter;
     }
 
     /**
@@ -109,8 +110,7 @@ public class ErrorManager {
      * @param eventBus     The event bus to listen for error events on.
      */
     public void initialise(final AggregateConfigProvider globalConfig, final Path directory,
-            final DMDircMBassador eventBus, final ClientInfo clientInfo) {
-        this.clientInfo = clientInfo;
+            final DMDircMBassador eventBus) {
         this.eventBus = eventBus;
         eventBus.subscribe(this);
         RavenFactory.registerFactory(new DefaultRavenFactory());
@@ -297,7 +297,7 @@ public class ErrorManager {
         }
         error.setReportStatus(ErrorReportStatus.QUEUED);
 
-        reportThread.submit(new ErrorReportingRunnable(error, clientInfo));
+        reportThread.submit(new ErrorReportingRunnable(sentryErrorReporter, error));
     }
 
     /**

src/com/dmdirc/logger/ErrorReportingRunnable.java

@@ -22,34 +22,31 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.util.ClientInfo;
-
 /**
  * Runnable that reports an error.
  */
 public class ErrorReportingRunnable implements Runnable {
 
     private final ProgramError error;
-    private final ClientInfo clientInfo;
+    private final SentryErrorReporter sentryErrorReporter;
 
     /**
      * Runnable used to report errors.
      *
      * @param error Error to report
      */
-    public ErrorReportingRunnable(final ProgramError error, final ClientInfo clientInfo) {
+    public ErrorReportingRunnable(final SentryErrorReporter sentryErrorReporter,
+            final ProgramError error) {
         this.error = error;
-        this.clientInfo = clientInfo;
+        this.sentryErrorReporter = sentryErrorReporter;
     }
 
     @Override
     public void run() {
-        do {
-            error.setReportStatus(ErrorReportStatus.SENDING);
-            new ErrorReporter(clientInfo).sendException(error.getMessage(), error.getLevel(), error
-                    .getDate(), error.getThrowable(), error.getDetails());
-            error.setReportStatus(ErrorReportStatus.FINISHED);
-        } while (error.getReportStatus() == ErrorReportStatus.QUEUED);
+        error.setReportStatus(ErrorReportStatus.SENDING);
+        sentryErrorReporter.sendException(error.getMessage(), error.getLevel(), error.getDate(),
+                error.getThrowable(), error.getDetails());
+        error.setReportStatus(ErrorReportStatus.FINISHED);
     }
 
 }

src/com/dmdirc/logger/ProgramError.java

@@ -42,7 +42,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
  * Stores a program error.
  */
-public final class ProgramError implements Serializable {
+public class ProgramError implements Serializable {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 4;

src/com/dmdirc/logger/ErrorReporter.java → src/com/dmdirc/logger/SentryErrorReporter.java

@@ -28,6 +28,8 @@ import com.dmdirc.util.ClientInfo;
 import java.util.Date;
 
 import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 import net.kencochrane.raven.Raven;
 import net.kencochrane.raven.RavenFactory;
@@ -40,7 +42,8 @@ import net.kencochrane.raven.event.interfaces.MessageInterface;
 /**
  * Facilitates reporting errors to the DMDirc developers.
  */
-public class ErrorReporter {
+@Singleton
+public class SentryErrorReporter {
 
     /** DSN used to connect to Sentry. */
     private static final String SENTRY_DSN = "https://d53a31a3c53c4a4f91c5ff503e612677:"
@@ -49,7 +52,8 @@ public class ErrorReporter {
     private static final String MODE_ALIAS_TEMPLATE = "%s\n\nConnection headers:\n%s";
     private final ClientInfo clientInfo;
 
-    public ErrorReporter(final ClientInfo clientInfo) {
+    @Inject
+    public SentryErrorReporter(final ClientInfo clientInfo) {
         this.clientInfo = clientInfo;
     }
 

test/com/dmdirc/logger/ErrorReportStatusTest.java

@@ -41,8 +41,9 @@ public class ErrorReportStatusTest {
 
     @Test
     public void testTerminal() {
-        assertTrue(ErrorReportStatus.ERROR.isTerminal());
         assertTrue(ErrorReportStatus.WAITING.isTerminal());
+        assertTrue(ErrorReportStatus.ERROR.isTerminal());
+        assertFalse(ErrorReportStatus.QUEUED.isTerminal());
         assertFalse(ErrorReportStatus.SENDING.isTerminal());
         assertTrue(ErrorReportStatus.FINISHED.isTerminal());
         assertTrue(ErrorReportStatus.NOT_APPLICABLE.isTerminal());

test/com/dmdirc/logger/ProgramErrorTest.java

@@ -23,20 +23,26 @@
 package com.dmdirc.logger;
 
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.ProgramErrorStatusEvent;
 import com.dmdirc.util.ClientInfo;
 
 import com.google.common.collect.Lists;
 
 import java.util.Date;
+import java.util.List;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ProgramErrorTest {
@@ -44,6 +50,7 @@ public class ProgramErrorTest {
     @Mock private ErrorManager errorManager;
     @Mock private DMDircMBassador eventBus;
     @Mock private ClientInfo clientInfo;
+    @Captor private ArgumentCaptor<ProgramErrorStatusEvent> event;
 
     @Test(expected = NullPointerException.class)
     public void testConstructorNullErrorLevel() {
@@ -108,10 +115,14 @@ public class ProgramErrorTest {
         assertEquals(ErrorReportStatus.WAITING, pe.getReportStatus());
         pe.setReportStatus(null);
         assertEquals(ErrorReportStatus.WAITING, pe.getReportStatus());
+        verify(eventBus, never()).publishAsync(event.capture());
         pe.setReportStatus(ErrorReportStatus.WAITING);
         assertEquals(ErrorReportStatus.WAITING, pe.getReportStatus());
+        verify(eventBus, never()).publishAsync(event.capture());
         pe.setReportStatus(ErrorReportStatus.ERROR);
         assertEquals(ErrorReportStatus.ERROR, pe.getReportStatus());
+        verify(eventBus).publishAsync(event.capture());
+        assertEquals(pe, event.getValue().getError());
     }
 
     @Test
@@ -122,6 +133,15 @@ public class ProgramErrorTest {
         assertTrue(pe.toString().contains("moo"));
     }
 
+    @Test
+    public void testGetTrace() {
+        final List<String> trace = Lists.newArrayList("test", "test1", "test2");
+        final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
+                new UnsupportedOperationException(), trace, null, new Date(), errorManager,
+                eventBus);
+        assertEquals(trace, pe.getTrace());
+    }
+
     @Test
     public void testEquals() {
         final Exception ex = new UnsupportedOperationException();

test/com/dmdirc/logger/ErrorReporterTest.java → test/com/dmdirc/logger/SentryErrorReporterTest.java

@@ -51,13 +51,13 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
-public class ErrorReporterTest {
+public class SentryErrorReporterTest {
 
     private static RavenFactory ravenFactory;
     @Mock private Raven raven;
     @Mock private ClientInfo clientInfo;
     @Captor private ArgumentCaptor<Event> eventCaptor;
-    private ErrorReporter errorReporter;
+    private SentryErrorReporter sentryErrorReporter;
 
     @BeforeClass
     public static void setUpClass() {
@@ -69,12 +69,12 @@ public class ErrorReporterTest {
     @Before
     public void setUp() {
         when(ravenFactory.createRavenInstance(Matchers.<Dsn>anyObject())).thenReturn(raven);
-        errorReporter = new ErrorReporter(clientInfo);
+        sentryErrorReporter = new SentryErrorReporter(clientInfo);
     }
 
     @Test
     public void testSendsMessage() {
-        errorReporter.sendException("message 123", ErrorLevel.MEDIUM, new Date(), null, null);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.MEDIUM, new Date(), null, null);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals("message 123", eventCaptor.getValue().getMessage());
     }
@@ -82,49 +82,49 @@ public class ErrorReporterTest {
     @Test
     public void testSendsTimestamp() {
         final Date date = new Date(561859200000l);
-        errorReporter.sendException("message 123", ErrorLevel.MEDIUM, date, null, null);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.MEDIUM, date, null, null);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(date, eventCaptor.getValue().getTimestamp());
     }
 
     @Test
     public void testSendsLowLevelAsInfo() {
-        errorReporter.sendException("message 123", ErrorLevel.LOW, new Date(), null, null);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.LOW, new Date(), null, null);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(Event.Level.INFO, eventCaptor.getValue().getLevel());
     }
 
     @Test
     public void testSendsMediumLevelAsWarning() {
-        errorReporter.sendException("message 123", ErrorLevel.MEDIUM, new Date(), null, null);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.MEDIUM, new Date(), null, null);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(Event.Level.WARNING, eventCaptor.getValue().getLevel());
     }
 
     @Test
     public void testSendsHighLevelAsError() {
-        errorReporter.sendException("message 123", ErrorLevel.HIGH, new Date(), null, null);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.HIGH, new Date(), null, null);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(Event.Level.ERROR, eventCaptor.getValue().getLevel());
     }
 
     @Test
     public void testSendsFatalLevelAsFatal() {
-        errorReporter.sendException("message 123", ErrorLevel.FATAL, new Date(), null, null);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.FATAL, new Date(), null, null);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(Event.Level.FATAL, eventCaptor.getValue().getLevel());
     }
 
     @Test
     public void testSendsUnknownLevelAsInfo() {
-        errorReporter.sendException("message 123", ErrorLevel.UNKNOWN, new Date(), null, null);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.UNKNOWN, new Date(), null, null);
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals(Event.Level.INFO, eventCaptor.getValue().getLevel());
     }
 
     @Test
     public void testAddsDetailsAsExtra() {
-        errorReporter.sendException("message 123", ErrorLevel.UNKNOWN, new Date(), null,
+        sentryErrorReporter.sendException("message 123", ErrorLevel.UNKNOWN, new Date(), null,
                 "details 456");
         verify(raven).sendEvent(eventCaptor.capture());
         assertEquals("details 456", eventCaptor.getValue().getExtra().get("details"));
@@ -133,7 +133,7 @@ public class ErrorReporterTest {
     @Test
     public void testAddsExceptionInterface() {
         final Exception exception = new IndexOutOfBoundsException("Message blah");
-        errorReporter.sendException("message 123", ErrorLevel.UNKNOWN, new Date(), exception, null);
+        sentryErrorReporter.sendException("message 123", ErrorLevel.UNKNOWN, new Date(), exception, null);
         verify(raven).sendEvent(eventCaptor.capture());
         final SentryInterface iface = eventCaptor.getValue().getSentryInterfaces()
                 .get(ExceptionInterface.EXCEPTION_INTERFACE);