cwinfo/yggdrasil-map
4
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-map synced 2025-08-14 15:58:10 +00:00
Code Releases Activity

log graph insertions

Browse Source
This commit is contained in:
Michał Zieliński
2015-11-21 13:03:19 +01:00
parent 22052a3840
commit 2beed33600
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/graphData.py
View File

@@ -2,26 +2,34 @@ import json
from database import NodeDB
from graph import Node, Edge
import traceback
import time
def insert_graph_data(config, data, mail, ip):
def insert_graph_data(config, data, mail, ip, version):
try:
graph_data = json.loads(data)
graph_data = json.loads(data)
except ValueError:
return 'Invalid JSON'
log = '[%s] version: %d, mail: %r, nodes: %d, edges: %d' % (
time.strftime('%Y-%m-%d %H:%M:%S'),
version, mail, len(graph_data['nodes']), len(graph_data['edges']))
with open(config['LOG'], 'a') as f:
f.write(log + '\n')
nodes = dict()
edges = []
try:
for n in graph_data['nodes']:
try:
try:
node = Node(n['ip'], version=n['version'])
nodes[n['ip']] = node
except Exception:
pass
for e in graph_data['edges']:
try:
try:
edge = Edge(nodes[e['a']], nodes[e['b']])
edges.append(edge)
except Exception:
@@ -40,7 +48,7 @@ def insert_graph_data(config, data, mail, ip):
with NodeDB(config) as db:
db.insert_graph(nodes, edges, uploaded_by)
except Exception:
traceback.print_exc()
traceback.print_exc()
return 'Database failure'
return None