Merge pull request #1186 from ITISFoundation/FREEZE_Ueberwald_early_2

Hotfix Fix/websocket conn (#1185)
ITISFoundation · Nov 26, 2019 · 8fc180d · 8fc180d
2 parents 37b4344 + 0574d7c
commit 8fc180d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/services/web/server/src/simcore_service_webserver/sockets_handlers.py b/services/web/server/src/simcore_service_webserver/sockets_handlers.py
@@ -17,7 +17,10 @@
 log = logging.getLogger(__file__)
 
 # TODO: separate API from server application!
-sio = socketio.AsyncServer(async_mode="aiohttp", logging=log)
+sio = socketio.AsyncServer(async_mode="aiohttp",
+    logger=log,
+    cors_allowed_origins='*', # FIXME: deactivate when reverse proxy issue with traefik resolved
+    engineio_logger=log)
 
 
 @sio.on("connect")

diff --git a/services/web/server/tests/integration/fixtures/celery_service.py b/services/web/server/tests/integration/fixtures/celery_service.py
@@ -29,4 +29,4 @@ def wait_till_celery_responsive(url):
 
     status = celery.bin.celery.CeleryCommand.commands['status']()
     status.app = status.get_app()
-    status.run()
+    status.run() # raises celery.bin.base.Error if cannot run
diff --git a/services/web/server/tests/integration/fixtures/docker_compose.py b/services/web/server/tests/integration/fixtures/docker_compose.py
@@ -4,24 +4,18 @@
     Here we can find fixtures of most of these configurations
 
 """
-
-# pylint:disable=wildcard-import
-# pylint:disable=unused-import
 # pylint:disable=unused-variable
 # pylint:disable=unused-argument
 # pylint:disable=redefined-outer-name
 
-
 import os
 import re
 import shutil
 import socket
-import subprocess
 import sys
-from collections import defaultdict
 from copy import deepcopy
 from pathlib import Path
-from typing import Dict, List, Union
+from typing import Dict, List
 
 import pytest
 import yaml