From de53282c1234c6f0462b91e0549199ae5d891d3b Mon Sep 17 00:00:00 2001
From: image <>
Date: Fri, 28 Aug 2020 21:26:40 -0400
Subject: [PATCH] changed windows watchdog behavior to not delete zoneserver
---
EQ2/source/WorldServer/World.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/EQ2/source/WorldServer/World.cpp b/EQ2/source/WorldServer/World.cpp
index 0f1dfa72b..a1c759747 100644
--- a/EQ2/source/WorldServer/World.cpp
+++ b/EQ2/source/WorldServer/World.cpp
@@ -2324,17 +2324,19 @@ void ZoneList::WatchdogHeartbeat()
if (diff > 60000)
{
tmp->SetWatchdogTime(Timer::GetCurrentTime2()); // reset so we don't continuously flood this heartbeat
- LogWrite(WORLD__ERROR, 1, "World", "Zone %s is hung for %i.. attempting to cancel threads...", tmp->GetZoneName(), diff);
+ LogWrite(WORLD__ERROR, 1, "World", "Zone %s is hung for %i milliseconds.. attempting to cancel threads...", tmp->GetZoneName(), diff);
+#ifndef WIN32
tmp->CancelThreads();
zlist.erase(zone_iter);
- MZoneList.releasewritelock(__FUNCTION__, __LINE__);
safe_delete(tmp);
+#endif
+ MZoneList.releasewritelock(__FUNCTION__, __LINE__);
match = true;
break;
}
else if (diff > 30000 && !tmp->isZoneShuttingDown())
{
- LogWrite(WORLD__ERROR, 1, "World", "Zone %s is hung for %i.. attempting shutdown", tmp->GetZoneName(), diff);
+ LogWrite(WORLD__ERROR, 1, "World", "Zone %s is hung for %i milliseconds.. attempting shutdown", tmp->GetZoneName(), diff);
tmp->Shutdown();
}
}