Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77 from P0nk/fix-shutdown-logging

Browse Source 
Fix shutdown logging
This commit is contained in:
Ponk
2022-06-19 08:01:12 +02:00
committed by GitHub
parent 45c9e6fc7e 89ababc5c0
commit 563d3033b9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/server/Server.java
View File

@@ -53,6 +53,7 @@ import net.server.guild.Guild;
import net.server.guild.GuildCharacter; import net.server.guild.GuildCharacter;
import net.server.task.*; import net.server.task.*;
import net.server.world.World; import net.server.world.World;
import org.apache.logging.log4j.LogManager;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import server.CashShop.CashItemFactory; import server.CashShop.CashItemFactory;
@@ -1922,9 +1923,13 @@ public class Server {
TimerManager.getInstance().purge(); TimerManager.getInstance().purge();
TimerManager.getInstance().stop(); TimerManager.getInstance().stop();
log.info("World and channels are offline."); log.info("Worlds and channels are offline.");
loginServer.stop(); loginServer.stop();
if (!restart) { // shutdown hook deadlocks if System.exit() method is used within its body chores, thanks MIKE for pointing that out if (!restart) { // shutdown hook deadlocks if System.exit() method is used within its body chores, thanks MIKE for pointing that out
// We disabled log4j's shutdown hook in the config file, so we have to manually shut it down here,
// after our last log statement.
LogManager.shutdown();
new Thread(() -> System.exit(0)).start(); new Thread(() -> System.exit(0)).start();
} else { } else {
log.info("Restarting the server..."); log.info("Restarting the server...");

2
src/main/resources/log4j2.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN" name="Cosmic"> <Configuration status="WARN" name="Cosmic" shutdownHook="disable">
<Properties> <Properties>
<Property name="filename">cosmic-log</Property> <Property name="filename">cosmic-log</Property>
<Property name="standard-pattern">%d{HH:mm:ss.SSS} [%t] %-5level %logger{2} - %msg%n</Property> <Property name="standard-pattern">%d{HH:mm:ss.SSS} [%t] %-5level %logger{2} - %msg%n</Property>