Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1620 from pypeclub/bugfix/console_listener_python_2

Browse source
This commit is contained in:
Milan Kolar 2021-06-02 13:59:26 +02:00 • committed by GitHub
commit 633f6c623d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
openpype/modules/webserver/host_console_listener.py
View file

@ -6,7 +6,6 @@ from concurrent.futures import CancelledError
from Qt import QtWidgets
from openpype.modules import ITrayService
from openpype.tools.tray_app.app import ConsoleDialog
log = logging.getLogger(__name__)
@ -35,6 +34,8 @@ class HostListener:
webserver.add_route('*', "/ws/host_listener", self.websocket_handler)
def _host_is_connecting(self, host_name, label):
from openpype.tools.tray_app.app import ConsoleDialog
""" Initialize dialog, adds to submenu. """
services_submenu = self.module._services_submenu
action = QtWidgets.QAction(label, services_submenu)

8
openpype/modules/webserver/webserver_module.py
View file

@ -7,8 +7,6 @@ import six
from openpype import resources
from .. import PypeModule, ITrayService
from openpype.modules.webserver.host_console_listener import HostListener
@six.add_metaclass(ABCMeta)
class IWebServerRoutes:
@ -59,7 +57,11 @@ class WebServerModule(PypeModule, ITrayService):
)
def _add_listeners(self):
self._host_listener = HostListener(self.server_manager, self)
from openpype.modules.webserver import host_console_listener
self._host_listener = host_console_listener.HostListener(
self.server_manager, self
)
def start_server(self):
if self.server_manager: