The server has now 2 notification streams

* A new one for controller related events (compute, appliance templates etc.)
* The existing one for project related events (links, nodes etc.)

gns3server/handlers/api/controller/__init__.py

@@ -25,3 +25,4 @@ from .symbol_handler import SymbolHandler
 from .snapshot_handler import SnapshotHandler
 from .appliance_handler import ApplianceHandler
 from .gns3_vm_handler import GNS3VMHandler
+from .notification_handler import NotificationHandler

gns3server/handlers/api/controller/notification_handler.py

@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2015 GNS3 Technologies Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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
+import aiohttp
+from aiohttp.web import WebSocketResponse
+from gns3server.web.route import Route
+from gns3server.controller import Controller
+from gns3server.utils.asyncio import asyncio_ensure_future
+
+
+@asyncio.coroutine
+def process_websocket(ws):
+    """
+    Process ping / pong and close message
+    """
+    try:
+        yield from ws.receive()
+    except aiohttp.WSServerHandshakeError:
+        pass
+
+
+class NotificationHandler:
+
+    @Route.get(
+        r"/notifications",
+        description="Receive notifications about the controller",
+        status_codes={
+            200: "End of stream"
+        })
+    def notification(request, response):
+
+        controller = Controller.instance()
+        response.content_type = "application/json"
+        response.set_status(200)
+        response.enable_chunked_encoding()
+
+        yield from response.prepare(request)
+        with controller.notification.controller_queue() as queue:
+            while True:
+                try:
+                    msg = yield from queue.get_json(5)
+                    response.write(("{}\n".format(msg)).encode("utf-8"))
+                except asyncio.futures.CancelledError:
+                    break
+                yield from response.drain()
+
+    @Route.get(
+        r"/notifications/ws",
+        description="Receive notifications about controller from a Websocket",
+        status_codes={
+            200: "End of stream"
+        })
+    def notification_ws(request, response):
+
+        controller = Controller.instance()
+        ws = aiohttp.web.WebSocketResponse()
+        yield from ws.prepare(request)
+
+        asyncio_ensure_future(process_websocket(ws))
+        with controller.notification.controler_queue() as queue:
+            while True:
+                try:
+                    notification = yield from queue.get_json(5)
+                except asyncio.futures.CancelledError:
+                    break
+                if ws.closed:
+                    break
+                ws.send_str(notification)
+        return ws

gns3server/handlers/api/controller/project_handler.py

@@ -227,7 +227,7 @@ class ProjectHandler:
         response.enable_chunked_encoding()
 
         yield from response.prepare(request)
-        with controller.notification.queue(project) as queue:
+        with controller.notification.project_queue(project) as queue:
             while True:
                 try:
                     msg = yield from queue.get_json(5)
@@ -263,7 +263,7 @@ class ProjectHandler:
 
         asyncio_ensure_future(process_websocket(ws))
 
-        with controller.notification.queue(project) as queue:
+        with controller.notification.project_queue(project) as queue:
             while True:
                 try:
                     notification = yield from queue.get_json(5)

gns3server/handlers/api/controller/server_handler.py

@@ -109,6 +109,7 @@ class ServerHandler:
             # The init of the server could take some times
             # we ensure settings are loaded before returning them
             settings = Controller.instance().settings
+
             if settings is not None:
                 break
             yield from asyncio.sleep(0.5)
@@ -116,17 +117,16 @@ class ServerHandler:
 
     @Route.post(
         r"/settings",
-        description="Write gui settings on the server. Temporary will we removed in later releas",
+        description="Write gui settings on the server. Temporary will we removed in later releases",
         status_codes={
-            201: "Writed"
+            201: "Settings saved"
         })
     def write_settings(request, response):
         controller = Controller.instance()
         if controller.settings is None:  # Server is not loaded ignore settings update to prevent buggy client sync issue
             return
-        controller.settings = request.json
         try:
-            controller.save()
+            controller.settings = request.json
         except (OSError, PermissionError) as e:
             raise HTTPConflict(text="Can't save the settings {}".format(str(e)))
         response.json(controller.settings)