microservice.py

@@ -34,8 +34,9 @@ def report():
 
 
       return jsonify(j)
-    except:
-        return "Shat the bed", 500
+    except Exception as e:
+        error_message = {"error_message": e.message}
+        return jsonify(error_message), 500
 
 
 @app.route('/radio/report')
@@ -79,7 +80,8 @@ def connect(radio):
                 return "", 200
             except Exception as e:
                 radios.pop(radio)
-                return str(e), 500
+                error_message = {"error_message": e.message}
+                return jsonify(error_message), 500
 
 
     return "Radio device not found", 400
@@ -106,7 +108,8 @@ def disconnect(radio):
         radios.pop(radio)
         return "", 200
     else:
-        return "Radio not connected", 400
+        error_message = {"error_message": "Radio not connected"}
+        return jsonify(error_message), 400
 
 @app.route('/radio/<radio>/configure/<frequency>')
 def configure(radio, frequency):
@@ -134,7 +137,8 @@ def configure(radio, frequency):
     if radio in radios:
         return jsonify(radios[radio].configure(frequency))
     else:
-        return "Radio not connected", 400
+        error_message = {"error_message": "Radio not connected"}
+        return jsonify(error_message), 400
 
 @app.route('/radio/<radio>/start')
 def start_stream(radio):
@@ -153,7 +157,8 @@ def start_stream(radio):
         radios[radio].start_stream()
         return "", 200
     except Exception as e:
-        return str(e), 400
+        error_message = {"error_message": e.message}
+        return jsonify(error_message), 400
 
 @app.route('/radio/<radio>/end')
 def end_stream(radio):
@@ -170,7 +175,8 @@ def end_stream(radio):
         radios[radio].end_stream()
         return "", 200
     except Exception as e:
-        return str(e), 400
+        error_message = {"error_message": e.message}
+        return jsonify(error_message), 400
 
 @app.route('/radio/<radio>/info')
 def radio_info(radio):
@@ -191,7 +197,8 @@ def radio_info(radio):
     try:
         return jsonify(radios[radio].get_info())
     except Exception as e:
-        return str(e), 400
+        error_message = {"error_message": e.message}
+        return error_message, 400
 
 
 tubes = {}
@@ -222,7 +229,8 @@ def start_tuuube_stream(id):
         tubes[id].start_stream()
         return "", 200
     except Exception as e:
-        return str(e), 400
+        error_message = {"error_message": e.message}
+        return jsonify(error_message), 400
 
 @app.route('/tuuube/<id>/end')
 def end_tuuube_stream(id):
@@ -239,7 +247,8 @@ def end_tuuube_stream(id):
         tubes[id].end_stream()
         return "", 200
     except Exception as e:
-        return str(e), 400
+        error_message = {"error_message": e.message}
+        return jsonify(error_message), 400