diff --git a/ennstatus/api/views.py b/ennstatus/api/views.py --- a/ennstatus/api/views.py +++ b/ennstatus/api/views.py @@ -1,4 +1,5 @@ import ipaddress +import json from datetime import datetime @@ -160,14 +161,19 @@ def export(export_format, server_type): else: if server_type == 'all': current_app.logger.info('Getting all servers!') - servers = [server.json() for server in all_servers()] + servers = [ + json.loads( + server.json() + ) for server in all_servers() + ] else: current_app.logger.info('Getting all {}!'.format(server_type)) servers = list(all_servers_by_type(server_type.lower())) if export_format == 'json': current_app.logger.info('Returning as json!') - return str(servers) + return (json.dumps(servers), + 200, {'Content-Type': 'application/json'}) else: current_app.logger.info('Returning as xml!') return (render_template('api/export/xml/network.xml',