OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into pre/1.13

Browse source 
* origin/master:
  Fix watchdog restarting on short timeout (#1344)
This commit is contained in:
Aikar 2018-08-17 12:14:56 -04:00
commit dea0ab1e71
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Spigot-Server-Patches/Add-Early-Warning-Feature-to-WatchDog.patch
View file

@ -62,7 +62,7 @@ index 4ac0ab9974..0c45d75adf 100644
public static boolean bungee; public static boolean bungee;
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java 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 --- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -0,0 +0,0 @@ import java.lang.management.MonitorInfo; @@ -0,0 +0,0 @@ import java.lang.management.MonitorInfo;
@ -146,11 +146,12 @@ index 57a4748a30..ac6aeb875a 100644
+ +
log.log( Level.SEVERE, "------------------------------" ); log.log( Level.SEVERE, "------------------------------" );
+ if ( isLongTimeout )
+ {
if ( restart ) if ( restart )
{ {
RestartCommand.restart(); RestartCommand.restart();
} }
+ if (isLongTimeout) {
break; break;
+ } // Paper end + } // Paper end
} }