arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

Fix issue with asyncio.Queue which is not thread safe.

Browse Source
This commit is contained in:
grossmj 2024-11-17 14:39:22 +10:00
parent e83e12b51a
commit 31a2cb998d
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gns3server/compute/notification_manager.py
View File

@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import asyncio
from contextlib import contextmanager from contextlib import contextmanager
from gns3server.utils.notification_queue import NotificationQueue from gns3server.utils.notification_queue import NotificationQueue
@ -28,6 +28,7 @@ class NotificationManager:
def __init__(self): def __init__(self):
self._listeners = set() self._listeners = set()
self._loop = asyncio.get_event_loop()
@contextmanager @contextmanager
def queue(self): def queue(self):
@ -54,7 +55,7 @@ class NotificationManager:
""" """
for listener in self._listeners: for listener in self._listeners:
listener.put_nowait((action, event, kwargs)) self._loop.call_soon_threadsafe(listener.put_nowait, (action, event, kwargs))
@staticmethod @staticmethod
def reset(): def reset():

9
gns3server/controller/notification.py
View File

@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import os import asyncio
from contextlib import contextmanager from contextlib import contextmanager
from gns3server.utils.notification_queue import NotificationQueue from gns3server.utils.notification_queue import NotificationQueue
@ -32,6 +32,7 @@ class Notification:
self._controller = controller self._controller = controller
self._project_listeners = {} self._project_listeners = {}
self._controller_listeners = set() self._controller_listeners = set()
self._loop = asyncio.get_event_loop()
@contextmanager @contextmanager
def project_queue(self, project_id): def project_queue(self, project_id):
@ -73,7 +74,7 @@ class Notification:
""" """
for controller_listener in self._controller_listeners: for controller_listener in self._controller_listeners:
controller_listener.put_nowait((action, event, {})) self._loop.call_soon_threadsafe(controller_listener.put_nowait, (action, event, {}))
def project_has_listeners(self, project_id): def project_has_listeners(self, project_id):
""" """
@ -134,7 +135,7 @@ class Notification:
except KeyError: except KeyError:
return return
for listener in project_listeners: for listener in project_listeners:
listener.put_nowait((action, event, {})) self._loop.call_soon_threadsafe(listener.put_nowait, (action, event, {}))
def _send_event_to_all_projects(self, action, event): def _send_event_to_all_projects(self, action, event):
""" """
@ -146,4 +147,4 @@ class Notification:
""" """
for project_listeners in self._project_listeners.values(): for project_listeners in self._project_listeners.values():
for listener in project_listeners: for listener in project_listeners:
listener.put_nowait((action, event, {})) self._loop.call_soon_threadsafe(listener.put_nowait, (action, event, {}))