diff --git a/corefx/src/main/java/com/core/graph/CoreObservableGraph.java b/corefx/src/main/java/com/core/graph/CoreObservableGraph.java index 3b086346..cbf678f0 100644 --- a/corefx/src/main/java/com/core/graph/CoreObservableGraph.java +++ b/corefx/src/main/java/com/core/graph/CoreObservableGraph.java @@ -15,7 +15,6 @@ public class CoreObservableGraph extends ObservableGraph { @Override public boolean addEdge(E e, V v1, V v2, EdgeType edgeType) { - logger.info("graph adding edge: {} - {}", v1, v2); if (v1 == null || v2 == null) { return false; } @@ -24,7 +23,6 @@ public class CoreObservableGraph extends ObservableGraph { @Override public boolean addEdge(E e, V v1, V v2) { - logger.info("graph adding edge: {} - {}", v1, v2); if (v1 == null || v2 == null) { return false; } diff --git a/corefx/src/main/java/com/core/graph/NetworkGraph.java b/corefx/src/main/java/com/core/graph/NetworkGraph.java index b7206474..1ccf31ef 100644 --- a/corefx/src/main/java/com/core/graph/NetworkGraph.java +++ b/corefx/src/main/java/com/core/graph/NetworkGraph.java @@ -307,7 +307,7 @@ public class NetworkGraph { vertexId = Math.max(node.getId() + 1, node.getId()); Double x = Math.abs(node.getPosition().getX()); Double y = Math.abs(node.getPosition().getY()); - logger.info("adding session node: {}", node); + logger.info("adding session node: {}", node); graph.addVertex(node); graphLayout.setLocation(node, x, y); nodeMap.put(node.getId(), node); @@ -358,6 +358,7 @@ public class NetworkGraph { } public void addLink(CoreLink link) { + logger.info("adding session link: {}", link); link.setId(linkId++); CoreNode nodeOne = nodeMap.get(link.getNodeOne()); CoreNode nodeTwo = nodeMap.get(link.getNodeTwo()); diff --git a/webapp/websocket_routes.py b/webapp/websocket_routes.py index 4d5bebc4..289e0465 100644 --- a/webapp/websocket_routes.py +++ b/webapp/websocket_routes.py @@ -1,4 +1,4 @@ -from flask.ext.socketio import SocketIO, emit +from flask_socketio import SocketIO from core import logger