Skip to content

Commit 8fc180d

Browse files
authored
Merge pull request #1186 from ITISFoundation/FREEZE_Ueberwald_early_2
Hotfix Fix/websocket conn (#1185)
2 parents 37b4344 + 0574d7c commit 8fc180d

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

services/web/server/src/simcore_service_webserver/sockets_handlers.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
log = logging.getLogger(__file__)
1818

1919
# TODO: separate API from server application!
20-
sio = socketio.AsyncServer(async_mode="aiohttp", logging=log)
20+
sio = socketio.AsyncServer(async_mode="aiohttp",
21+
logger=log,
22+
cors_allowed_origins='*', # FIXME: deactivate when reverse proxy issue with traefik resolved
23+
engineio_logger=log)
2124

2225

2326
@sio.on("connect")

services/web/server/tests/integration/fixtures/celery_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ def wait_till_celery_responsive(url):
2929

3030
status = celery.bin.celery.CeleryCommand.commands['status']()
3131
status.app = status.get_app()
32-
status.run()
32+
status.run() # raises celery.bin.base.Error if cannot run

services/web/server/tests/integration/fixtures/docker_compose.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,18 @@
44
Here we can find fixtures of most of these configurations
55
66
"""
7-
8-
# pylint:disable=wildcard-import
9-
# pylint:disable=unused-import
107
# pylint:disable=unused-variable
118
# pylint:disable=unused-argument
129
# pylint:disable=redefined-outer-name
1310

14-
1511
import os
1612
import re
1713
import shutil
1814
import socket
19-
import subprocess
2015
import sys
21-
from collections import defaultdict
2216
from copy import deepcopy
2317
from pathlib import Path
24-
from typing import Dict, List, Union
18+
from typing import Dict, List
2519

2620
import pytest
2721
import yaml

0 commit comments

Comments
 (0)