Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Maintenance time calculations should be done in minutes, not seconds.

Browse source 
Should resolve #2336
This commit is contained in:
RealKinetix 2021-03-29 22:34:55 -07:00
parent ca58209244
commit 7d20d35375
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/server/portal/portal.py
View file

@ -119,7 +119,7 @@ def _portal_maintenance():
_MAINTENANCE_COUNT += 1 _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 # drop database connection every 7 hrs to avoid default timeouts on MySQL
# (see https://github.com/evennia/evennia/issues/1376) # (see https://github.com/evennia/evennia/issues/1376)
connection.close() connection.close()

8
evennia/server/server.py
View file

@ -140,16 +140,16 @@ def _server_maintenance():
_GAMETIME_MODULE.SERVER_RUNTIME_LAST_UPDATED = now _GAMETIME_MODULE.SERVER_RUNTIME_LAST_UPDATED = now
ServerConfig.objects.conf("runtime", _GAMETIME_MODULE.SERVER_RUNTIME) ServerConfig.objects.conf("runtime", _GAMETIME_MODULE.SERVER_RUNTIME)
if _MAINTENANCE_COUNT % 300 == 0: if _MAINTENANCE_COUNT % 5 == 0:
# check cache size every 5 minutes # check cache size every 5 minutes
_FLUSH_CACHE(_IDMAPPER_CACHE_MAXSIZE) _FLUSH_CACHE(_IDMAPPER_CACHE_MAXSIZE)
if _MAINTENANCE_COUNT % 3600 == 0: if _MAINTENANCE_COUNT % 60 == 0:
# validate scripts every hour # validate scripts every hour
evennia.ScriptDB.objects.validate() evennia.ScriptDB.objects.validate()
if _MAINTENANCE_COUNT % 3700 == 0: if _MAINTENANCE_COUNT % 61 == 0:
# validate channels off-sync with scripts # validate channels off-sync with scripts
evennia.CHANNEL_HANDLER.update() 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 # drop database connection every 7 hrs to avoid default timeouts on MySQL
# (see https://github.com/evennia/evennia/issues/1376) # (see https://github.com/evennia/evennia/issues/1376)
connection.close() connection.close()