beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-25 09:00:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check for startup when receiving shutdown notice

Browse source
This commit is contained in:
crschnick 2024-08-31 08:21:36 +00:00
parent 26762d4d80
commit b8a981eb1f
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
View file

@ -255,6 +255,12 @@ public abstract class OperationMode {
} }
public static void shutdown(boolean inShutdownHook, boolean hasError) { public static void shutdown(boolean inShutdownHook, boolean hasError) {
// We can receive shutdown events while we are still starting up
// In that case ignore them until we are finished
if (isInStartup()) {
return;
}
// In case we are stuck while in shutdown, instantly exit this application // In case we are stuck while in shutdown, instantly exit this application
if (inShutdown && inShutdownHook) { if (inShutdown && inShutdownHook) {
TrackEvent.info("Received another shutdown request while in shutdown hook. Halting ..."); TrackEvent.info("Received another shutdown request while in shutdown hook. Halting ...");

1
app/src/main/java/io/xpipe/app/issue/SentryErrorHandler.java
View file

@ -157,6 +157,7 @@ public class SentryErrorHandler implements ErrorHandler {
"logs", "logs",
Boolean.toString( Boolean.toString(
ee.isShouldSendDiagnostics() && !ee.getAttachments().isEmpty())); ee.isShouldSendDiagnostics() && !ee.getAttachments().isEmpty()));
s.setTag("inStartup", Boolean.toString(OperationMode.isInStartup()));
s.setTag("inShutdown", Boolean.toString(OperationMode.isInShutdown())); s.setTag("inShutdown", Boolean.toString(OperationMode.isInShutdown()));
s.setTag("unhandled", Boolean.toString(ee.isUnhandled())); s.setTag("unhandled", Boolean.toString(ee.isUnhandled()));