src/api_schema/router.rs: implement list_subdirs() helper

This commit is contained in:
Dietmar Maurer
2019-04-16 12:07:02 +02:00
parent 062d4916ff
commit 13f1cc17ea
9 changed files with 36 additions and 81 deletions

View File

@ -223,18 +223,6 @@ pub fn router() -> Router {
);
let service_api = Router::new()
.get(ApiMethod::new(
|| {
let mut result = vec![];
for cmd in &["state", "start", "stop", "restart", "reload"] {
result.push(json!({"subdir": cmd }));
}
Ok(Value::from(result))
},
ObjectSchema::new("Directory index.")
.required("node", crate::api2::node::NODE_SCHEMA.clone())
.required("service", service_id_schema.clone()))
)
.subdir(
"state",
Router::new()
@ -293,7 +281,7 @@ pub fn router() -> Router {
).protected(true)
)
)
;
.list_subdirs();
let route = Router::new()
.get(

View File

@ -174,18 +174,6 @@ pub fn router() -> Router {
);
let upid_api = Router::new()
.get(ApiMethod::new(
|| {
let mut result = vec![];
for cmd in &["log", "status"] {
result.push(json!({"subdir": cmd }));
}
Ok(Value::from(result))
},
ObjectSchema::new("Directory index.")
.required("node", crate::api2::node::NODE_SCHEMA.clone())
.required("upid", upid_schema.clone()))
)
.delete(ApiMethod::new(
stop_task,
ObjectSchema::new("Try to stop a task.")
@ -225,7 +213,8 @@ pub fn router() -> Router {
.required("node", crate::api2::node::NODE_SCHEMA.clone())
.required("upid", upid_schema.clone()))
)
);
)
.list_subdirs();
let route = Router::new()