Merge pull request #96 from rzats/feature-CrashReporter

CrashReporter integration

Author: msteiger

.gitignore

@@ -1,4 +1,5 @@
 ## General
+*.log
 hs_err_pid*
 .gradle
 /config/metrics

desktop/build.gradle

@@ -12,6 +12,7 @@ dependencies {
     compile "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
     compile "com.badlogicgames.gdx:gdx-controllers-desktop:$gdxVersion"
     compile "com.badlogicgames.gdx:gdx-controllers-platform:$gdxVersion:natives-desktop"
+    compile "org.terasology:CrashReporter-destsol:3.0.0"
 }
 
 task run(type: JavaExec) {
@@ -74,4 +75,4 @@ task afterEclipseImport(description: "Post processing after project generation",
         printer.setPreserveWhitespace(true)
         printer.print(classpath)
     }
-}
+}

desktop/src/org/destinationsol/desktop/SolDesktop.java

@@ -8,15 +8,20 @@
 import org.destinationsol.SolFileReader;
 import org.destinationsol.game.DebugOptions;
 import org.destinationsol.soundtest.SoundTestListener;
-import org.lwjgl.Sys;
+import org.terasology.crashreporter.CrashReporter;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 public class SolDesktop {
@@ -59,20 +64,45 @@ public static void main(String[] argv) {
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
             @Override
             public void uncaughtException(Thread thread, final Throwable ex) {
+                // Get the exception stack trace string
                 StringWriter stringWriter = new StringWriter();
                 PrintWriter printWriter = new PrintWriter(stringWriter);
                 ex.printStackTrace(printWriter);
+                String exceptionString = stringWriter.getBuffer().toString();
 
-                String exceptionString = stringWriter.getBuffer().toString() + "Message: " + ex.getLocalizedMessage();
-                System.err.println("Uncaught exception: " + exceptionString);
-                Sys.alert("Uncaught Exception", exceptionString);
+                // Write to system.err
+                System.err.println(exceptionString);
+
+                // Create a crash dump file
+                String fileName = "crash-" + new SimpleDateFormat("yyyy-dd-MM_HH-mm-ss").format(new Date()) + ".log";
+                List<String> lines = Arrays.asList(exceptionString);
+                Path logPath = new MyReader().create(fileName, lines).toAbsolutePath().getParent();
+
+                // Run asynchronously so that the error message view is not blocked
+                new Thread(() -> {
+                    CrashReporter.report(ex, logPath);
+                }).start();
             }
         });
 
         new LwjglApplication(new SolApplication(), c);
     }
 
     private static class MyReader implements SolFileReader {
+        @Override
+        public Path create(String fileName, List<String> lines) {
+            if (DebugOptions.DEV_ROOT_PATH != null) {
+                fileName = DebugOptions.DEV_ROOT_PATH + fileName;
+            }
+            Path file = Paths.get(fileName);
+            try {
+                java.nio.file.Files.write(file, lines, Charset.forName("UTF-8"));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            return file;
+        }
+
         @Override
         public List<String> read(String fileName) {
             if (DebugOptions.DEV_ROOT_PATH != null) {

main/src/org/destinationsol/SolApplication.java

@@ -28,10 +28,15 @@
 import org.destinationsol.game.SolGame;
 import org.destinationsol.game.sound.MusicManager;
 import org.destinationsol.menu.MenuScreens;
-import org.destinationsol.ui.*;
+import org.destinationsol.ui.DebugCollector;
+import org.destinationsol.ui.FontSize;
+import org.destinationsol.ui.SolInputManager;
+import org.destinationsol.ui.SolLayouts;
+import org.destinationsol.ui.UiDrawer;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+
 public class SolApplication implements ApplicationListener {
 
   private SolInputManager myInputMan;
@@ -111,6 +116,10 @@ private void safeUpdate() {
       PrintWriter pw = new PrintWriter(sw);
       t.printStackTrace(pw);
       myFatalErrorTrace = sw.toString();
+
+      if (!myReallyMobile) {
+        throw t;
+      }
     }
   }
 

main/src/org/destinationsol/SolFileReader.java

@@ -16,8 +16,11 @@
 
 package org.destinationsol;
 
+import java.nio.file.Path;
 import java.util.List;
 
 public interface SolFileReader {
-  List<String> read(String fileName);
+    Path create(String fileName, List<String> lines);
+
+    List<String> read(String fileName);
 }