External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-13 16:07:29 -03:30
Code Issues Packages Projects Releases Wiki Activity

Renames Persistence to NetworkingEvents and removes the persistance channel

Browse Source
This commit is contained in:
Ben Thomasson
2018-03-23 10:20:03 -04:00
committed by Jared Tabor
parent 38eb2691a8
commit cafc62bd20
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
awx/network_ui/consumers.py
View File

@@ -1,5 +1,5 @@
# Copyright (c) 2017 Red Hat, Inc # Copyright (c) 2017 Red Hat, Inc
from channels import Group, Channel from channels import Group
from channels.sessions import channel_session from channels.sessions import channel_session
from awx.network_ui.models import Topology, Device, Link, Client, Interface from awx.network_ui.models import Topology, Device, Link, Client, Interface
from awx.network_ui.models import TopologyInventory from awx.network_ui.models import TopologyInventory
@@ -27,10 +27,10 @@ def parse_inventory_id(data):
return inventory_id return inventory_id
class Persistence(object): class NetworkingEvents(object):
''' '''
Provides database persistence for the topology canvas. Provides handlers for the networking events for the topology canvas.
''' '''
def parse_message_text(self, message_text, client_id): def parse_message_text(self, message_text, client_id):
@@ -66,11 +66,7 @@ class Persistence(object):
return return
handler = self.get_handler(message_type) handler = self.get_handler(message_type)
if handler is not None: if handler is not None:
try: handler(message_value, topology_id, client_id)
handler(message_value, topology_id, client_id)
except Exception:
Group("client-%s" % client_id).send({"text": json.dumps(["Error", "Server Error"])})
raise
else: else:
logger.warning("Unsupported message %s: no handler", message_type) logger.warning("Unsupported message %s: no handler", message_type)
@@ -185,6 +181,9 @@ class Persistence(object):
logger.warning("Unsupported message %s", message['msg_type']) logger.warning("Unsupported message %s", message['msg_type'])
networking_events_dispatcher = NetworkingEvents()
@channel_session @channel_session
def ws_connect(message): def ws_connect(message):
data = urlparse.parse_qs(message.content['query_string']) data = urlparse.parse_qs(message.content['query_string'])
@@ -268,10 +267,10 @@ def send_snapshot(channel, topology_id):
def ws_message(message): def ws_message(message):
# Send to all clients editing the topology # Send to all clients editing the topology
Group("topology-%s" % message.channel_session['topology_id']).send({"text": message['text']}) Group("topology-%s" % message.channel_session['topology_id']).send({"text": message['text']})
# Send to persistence handler # Send to networking_events handler
Channel('persistence').send({"text": message['text'], networking_events_dispatcher.handle({"text": message['text'],
"topology": message.channel_session['topology_id'], "topology": message.channel_session['topology_id'],
"client": message.channel_session['client_id']}) "client": message.channel_session['client_id']})
@channel_session @channel_session

3
awx/network_ui/routing.py
View File

@@ -1,10 +1,9 @@
# Copyright (c) 2017 Red Hat, Inc # Copyright (c) 2017 Red Hat, Inc
from channels.routing import route from channels.routing import route
from awx.network_ui.consumers import ws_connect, ws_message, ws_disconnect, Persistence from awx.network_ui.consumers import ws_connect, ws_message, ws_disconnect
channel_routing = [ channel_routing = [
route("websocket.connect", ws_connect, path=r"^/network_ui/topology"), route("websocket.connect", ws_connect, path=r"^/network_ui/topology"),
route("websocket.receive", ws_message, path=r"^/network_ui/topology"), route("websocket.receive", ws_message, path=r"^/network_ui/topology"),
route("websocket.disconnect", ws_disconnect, path=r"^/network_ui/topology"), route("websocket.disconnect", ws_disconnect, path=r"^/network_ui/topology"),
route("persistence", Persistence().handle),
] ]