university-projects
/
university-final-iot-backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/app-config

develop
Ensar Sarajčić 2018-11-04 13:47:29 +01:00
parent cfc34dfb37 9dd8fa1d8d
commit cd4b409fd3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/resources/app.py
View File

@ -123,10 +123,10 @@ def get_email_info(config):
class MqttConfigResource(ProtectedResource): class MqttConfigResource(ProtectedResource):
@swag_from('swagger/get_mqtt_config_spec.yaml') @swag_from('swagger/get_mqtt_config_spec.yaml')
def get(self): def get(self):
return { return MqttConfigSchema().dump({
'broker': get_mqtt_broker_info(app.config), 'broker': get_mqtt_broker_info(app.config),
'endpoints': get_mqtt_endpoints(app.config) 'endpoints': get_mqtt_endpoints(app.config)
}, 200 }), 200
class AppConfigResource(ProtectedResource): class AppConfigResource(ProtectedResource):