Merge pull request #2445 from GNS3/bugfix/2426

Fix issue with asyncio.Queue

gns3server/compute/notification_manager.py

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

gns3server/controller/notification.py

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