afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated rest service data returned and names used

Browse source
This commit is contained in:
Blake J. Harnden 2018-08-20 09:27:57 -07:00
parent 1ddea3ed54
commit eec7fbb213
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
webapp/app.py
View file

@ -571,14 +571,16 @@ def get_node_service(session_id, node_id, service_name):
service = session.services.get_service(node_id, service_name, default_service=True) service = session.services.get_service(node_id, service_name, default_service=True)
service_config = { service_config = {
"executables": service.executables,
"dependencies": service.dependencies,
"dirs": service.dirs, "dirs": service.dirs,
"files": service.configs, "configs": service.configs,
"startidx": "0", "startup": service.startup,
"cmdup": service.startup, "validate": service.validate,
"cmddown": service.shutdown, "validation_mode": service.validation_mode.name,
"cmdval": service.validate, "validation_timer": service.validation_timer,
"shutdown": service.shutdown,
"meta": service.meta, "meta": service.meta,
"starttime": "0"
} }
return jsonify(service_config) return jsonify(service_config)
@ -601,11 +603,11 @@ def set_node_service(session_id, node_id, service_name):
# guarantee custom service exists # guarantee custom service exists
session.services.set_service(node_id, service_name) session.services.set_service(node_id, service_name)
service = session.services.get_service(node_id, service_name) service = session.services.get_service(node_id, service_name)
service.startup = tuple(data["cmdup"]) service.startup = tuple(data["startup"])
logger.info("custom startup: %s", service.startup) logger.info("custom startup: %s", service.startup)
service.validate = tuple(data["cmdval"]) service.validate = tuple(data["validate"])
logger.info("custom validate: %s", service.validate) logger.info("custom validate: %s", service.validate)
service.shutdown = tuple(data["cmddown"]) service.shutdown = tuple(data["shutdown"])
logger.info("custom shutdown: %s", service.shutdown) logger.info("custom shutdown: %s", service.shutdown)
return jsonify() return jsonify()