mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 09:27:45 +01:00
Merge remote-tracking branch 'origin/master' into pre/1.13
* origin/master: Fix watchdog restarting on short timeout (#1344)
This commit is contained in:
commit
0ac59814c0
@ -1,4 +1,4 @@
|
||||
From 28c2b63fee54568b70849d02503af0f619c70fc1 Mon Sep 17 00:00:00 2001
|
||||
From cd1acb9c8bd6310d126bfdf7807a0168b4af9096 Mon Sep 17 00:00:00 2001
|
||||
From: miclebrick <miclebrick@outlook.com>
|
||||
Date: Wed, 8 Aug 2018 15:30:52 -0400
|
||||
Subject: [PATCH] Add Early Warning Feature to WatchDog
|
||||
@ -62,7 +62,7 @@ index 4ac0ab9974..0c45d75adf 100644
|
||||
|
||||
public static boolean bungee;
|
||||
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
index 57a4748a30..ac6aeb875a 100644
|
||||
index 57a4748a30..19df383e06 100644
|
||||
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
@@ -5,6 +5,7 @@ import java.lang.management.MonitorInfo;
|
||||
@ -115,7 +115,7 @@ index 57a4748a30..ac6aeb875a 100644
|
||||
log.log( Level.SEVERE, "The server has stopped responding!" );
|
||||
log.log( Level.SEVERE, "Please report this to https://github.com/PaperMC/Paper/issues" );
|
||||
log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
|
||||
@@ -79,29 +95,45 @@ public class WatchdogThread extends Thread
|
||||
@@ -79,29 +95,46 @@ public class WatchdogThread extends Thread
|
||||
}
|
||||
}
|
||||
// Paper end
|
||||
@ -146,11 +146,12 @@ index 57a4748a30..ac6aeb875a 100644
|
||||
+
|
||||
log.log( Level.SEVERE, "------------------------------" );
|
||||
|
||||
+ if ( isLongTimeout )
|
||||
+ {
|
||||
if ( restart )
|
||||
{
|
||||
RestartCommand.restart();
|
||||
}
|
||||
+ if (isLongTimeout) {
|
||||
break;
|
||||
+ } // Paper end
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user