Merge branch 'master' of github.com:stevenvanrossem/son-emu

Conflicts:
	src/emuvim/api/rest/network.py

diff --git a/dashboard/README.md b/dashboard/README.md
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/dashboard/css/main.css b/dashboard/css/main.css
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/dashboard/img/SONATA_new.png b/dashboard/img/SONATA_new.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/dashboard/index.html b/dashboard/index.html
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/dashboard/js/main.js b/dashboard/js/main.js
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/dashboard/son-emu-dashboard-screenshot.png b/dashboard/son-emu-dashboard-screenshot.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/misc/sonata-stress-service.son b/misc/sonata-stress-service.son
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/emuvim/api/rest/monitor.py b/src/emuvim/api/rest/monitor.py
index 6f99bdf..379c8d5 100755 (executable)
--- a/src/emuvim/api/rest/monitor.py
+++ b/src/emuvim/api/rest/monitor.py
@@ -214,7 +214,7 @@ class MonitorLinkAction(Resource):
             return (str(c1) + " " + str(c2)), 200, CORS_HEADER
         except Exception as ex:
             logging.exception("API error.")
-            return ex.message, 500
+            return ex.message, 500, CORS_HEADER
 
 class MonitorSkewAction(Resource):
     """

diff --git a/src/emuvim/api/rest/network.py b/src/emuvim/api/rest/network.py
index c4ab23f..10baa8f 100755 (executable)
--- a/src/emuvim/api/rest/network.py
+++ b/src/emuvim/api/rest/network.py
@@ -38,6 +38,7 @@ from flask import request
 import json
 
 logging.basicConfig(level=logging.INFO)
+
 CORS_HEADER = {'Access-Control-Allow-Origin': '*'}
 
 # the global net is set from the topology file, and connected via connectDCNetwork function in rest_api_endpoint.py