From 0773448b3547b7ebea6e733424ee6aca921835ab Mon Sep 17 00:00:00 2001
From: "andre.peters" <andre.peters@servercow.de>
Date: Thu, 1 Feb 2018 13:38:42 +0100
Subject: [PATCH] [Dockerapi] Fix jsonify output

---
 data/Dockerfiles/dockerapi/server.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/Dockerfiles/dockerapi/server.py b/data/Dockerfiles/dockerapi/server.py
index 7410c0ff..e0f43ef9 100644
--- a/data/Dockerfiles/dockerapi/server.py
+++ b/data/Dockerfiles/dockerapi/server.py
@@ -22,7 +22,7 @@ class containers_get(Resource):
         containers.update({container.attrs['Id']: container.attrs})
       return containers
     except Exception as e:
-      return jsonify(type='danger', msg=e)
+      return jsonify(type='danger', msg=str(e))
 
 class container_get(Resource):
   def get(self, container_id):
@@ -31,7 +31,7 @@ class container_get(Resource):
         for container in docker_client.containers.list(all=True, filters={"id": container_id}):
           return container.attrs
       except Exception as e:
-          return jsonify(type='danger', msg=e)
+          return jsonify(type='danger', msg=str(e))
     else:
       return jsonify(type='danger', msg='no or invalid id defined')
 
@@ -44,7 +44,7 @@ class container_post(Resource):
             container.stop()
           return jsonify(type='success', msg='command completed successfully')
         except Exception as e:
-          return jsonify(type='danger', msg=e)
+          return jsonify(type='danger', msg=str(e))
 
       elif post_action == 'start':
         try:
@@ -52,7 +52,7 @@ class container_post(Resource):
             container.start()
           return jsonify(type='success', msg='command completed successfully')
         except Exception as e:
-          return jsonify(type='danger', msg=e)
+          return jsonify(type='danger', msg=str(e))
 
       elif post_action == 'restart':
         try:
@@ -60,7 +60,7 @@ class container_post(Resource):
             container.restart()
           return jsonify(type='success', msg='command completed successfully')
         except Exception as e:
-          return jsonify(type='danger', msg=e)
+          return jsonify(type='danger', msg=str(e))
 
       elif post_action == 'exec':
 
@@ -72,13 +72,13 @@ class container_post(Resource):
             for container in docker_client.containers.list(filters={"id": container_id}):
               return container.exec_run(["/bin/bash", "-c", "/usr/local/bin/doveadm sieve list -u '" + request.json['username'].replace("'", "'\\''") + "'"], user='vmail')
           except Exception as e:
-            return jsonify(type='danger', msg=e)
+            return jsonify(type='danger', msg=str(e))
         elif request.json['cmd'] == 'sieve_print' and request.json['script_name'] and request.json['username']:
           try:
             for container in docker_client.containers.list(filters={"id": container_id}):
               return container.exec_run(["/bin/bash", "-c", "/usr/local/bin/doveadm sieve get -u '" + request.json['username'].replace("'", "'\\''") + "' '" + request.json['script_name'].replace("'", "'\\''") + "'"], user='vmail')
           except Exception as e:
-            return jsonify(type='danger', msg=e)
+            return jsonify(type='danger', msg=str(e))
         elif request.json['cmd'] == 'worker_password' and request.json['raw']:
           try:
             for container in docker_client.containers.list(filters={"id": container_id}):
@@ -89,7 +89,7 @@ class container_post(Resource):
               container.restart()
               return jsonify(type='success', msg='command completed successfully')
           except Exception as e:
-            return jsonify(type='danger', msg=e)
+            return jsonify(type='danger', msg=str(e))
 
         else:
           return jsonify(type='danger', msg='Unknown command')