From 7d20d353757d72d331b6da8e1e9c3822accb35cf Mon Sep 17 00:00:00 2001 From: RealKinetix Date: Mon, 29 Mar 2021 22:34:55 -0700 Subject: [PATCH] Maintenance time calculations should be done in minutes, not seconds. Should resolve #2336 --- evennia/server/portal/portal.py | 2 +- evennia/server/server.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py index d1af41a143..f3e29fb9a0 100644 --- a/evennia/server/portal/portal.py +++ b/evennia/server/portal/portal.py @@ -119,7 +119,7 @@ def _portal_maintenance(): _MAINTENANCE_COUNT += 1 - if _MAINTENANCE_COUNT % (3600 * 7) == 0: + if _MAINTENANCE_COUNT % (60 * 7) == 0: # drop database connection every 7 hrs to avoid default timeouts on MySQL # (see https://github.com/evennia/evennia/issues/1376) connection.close() diff --git a/evennia/server/server.py b/evennia/server/server.py index 4d09d8fdb6..fb112fe5cb 100644 --- a/evennia/server/server.py +++ b/evennia/server/server.py @@ -140,16 +140,16 @@ def _server_maintenance(): _GAMETIME_MODULE.SERVER_RUNTIME_LAST_UPDATED = now ServerConfig.objects.conf("runtime", _GAMETIME_MODULE.SERVER_RUNTIME) - if _MAINTENANCE_COUNT % 300 == 0: + if _MAINTENANCE_COUNT % 5 == 0: # check cache size every 5 minutes _FLUSH_CACHE(_IDMAPPER_CACHE_MAXSIZE) - if _MAINTENANCE_COUNT % 3600 == 0: + if _MAINTENANCE_COUNT % 60 == 0: # validate scripts every hour evennia.ScriptDB.objects.validate() - if _MAINTENANCE_COUNT % 3700 == 0: + if _MAINTENANCE_COUNT % 61 == 0: # validate channels off-sync with scripts evennia.CHANNEL_HANDLER.update() - if _MAINTENANCE_COUNT % (3600 * 7) == 0: + if _MAINTENANCE_COUNT % (60 * 7) == 0: # drop database connection every 7 hrs to avoid default timeouts on MySQL # (see https://github.com/evennia/evennia/issues/1376) connection.close()