Skip to content

Commit

Permalink
fix: Remove (failing) CrashReporter (#538)
Browse files Browse the repository at this point in the history
  • Loading branch information
skaldarnar authored Mar 28, 2020
1 parent 8e2e6d0 commit 02bf65e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 20 deletions.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ dependencies {
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7'
implementation group: 'net.java.dev.jna', name: 'jna', version: '4.1.0'
implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '4.1.0'
implementation group: 'org.terasology', name: 'CrashReporter', version: '1.2.+'
implementation group: 'com.github.rjeschke', name: 'txtmark', version: '0.11'

implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
Expand Down
23 changes: 4 additions & 19 deletions src/main/java/org/terasology/launcher/TerasologyLauncher.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,14 @@
import javafx.util.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.crashreporter.CrashReporter;
import org.terasology.launcher.gui.javafx.ApplicationController;
import org.terasology.launcher.log.TempLogFilePropertyDefiner;
import org.terasology.launcher.util.BundleUtils;
import org.terasology.launcher.util.HostServices;
import org.terasology.launcher.util.Languages;
import org.terasology.launcher.util.LauncherStartFailedException;
import org.terasology.launcher.version.TerasologyLauncherVersionInfo;

import java.io.IOException;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import java.util.MissingResourceException;
Expand Down Expand Up @@ -111,13 +108,14 @@ public void start(final Stage initialStage) {
showMainStage(config);
}
} catch (IOException | LauncherStartFailedException e) {
openCrashReporterAndExit(e);
logger.error("The TerasologyLauncher could not be started!", e);
System.exit(1);
}
});

launcherInitTask.setOnFailed(event -> {
Platform.exit();
openCrashReporterAndExit((Exception) event.getSource().getException());
logger.error("The TerasologyLauncher could not be started!", event.getSource().getException());
System.exit(1);
});

launcherInitTask.setOnCancelled(event -> Platform.exit());
Expand All @@ -134,19 +132,6 @@ private static void initProxy() {
System.setProperty("java.net.useSystemProxies", "true");
}

/**
* Opens the CrashReporter with the given exception and exits the launcher.
*
* @param e the exception causing the launcher to fail
*/
private void openCrashReporterAndExit(Exception e) {
logger.error("The TerasologyLauncher could not be started!");

Path logFile = TempLogFilePropertyDefiner.getInstance().getLogFile();
CrashReporter.report(e, logFile);
System.exit(1);
}

private void showMainStage(final LauncherConfiguration launcherConfiguration) throws IOException {
mainStage = new Stage(StageStyle.DECORATED);

Expand Down

0 comments on commit 02bf65e

Please sign in to comment.