Skip to content

Fix missing game directories causing webtiles hang #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
refracta wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix missing game directories causing webtiles hang #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import logging
import os

try:
from collections import OrderedDict
Expand Down Expand Up @@ -169,6 +170,23 @@ def create_game(game_key, overrides=None):
# Combine all game lists into one
games = OrderedDict(trunk + stable_versions + forks)

# Filter out games whose installation directories are missing. Without this
# check the webserver can hang while loading games when a version was not
# installed correctly.
def _filter_installed(game_dict):
base_dir = os.environ.get('CHROOT_CRAWL_BASEDIR', '%%CHROOT_CRAWL_BASEDIR%%')
root = os.environ.get('DGL_CHROOT', '%%DGL_CHROOT%%')
filtered = OrderedDict()
for key, cfg in game_dict.items():
game_dir = os.path.join(root, base_dir, f"crawl-{cfg['version']}")
if os.path.isdir(game_dir):
filtered[key] = cfg
else:
logging.warning("Skipping game %s: missing directory %s", key, game_dir)
return filtered

games = _filter_installed(games)

dgl_status_file = "%%CHROOT_WEBDIR%%/run/status"
forks_milestones = [
"%%CHROOT_CRAWL_BASEDIR%%/crawl-dcssca/saves/milestones",
Expand Down