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

Resolve merge errors

Browse source
This commit is contained in:
Griatch 2021-04-24 22:47:06 +02:00
commit ad0c0f39d0
3 changed files with 11 additions and 8 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
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()