kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ARI: Deleting log channels" into 13

Browse Source
This commit is contained in:
Joshua Colp
2015-08-07 10:41:22 -05:00
committed by Gerrit Code Review
parent 4b1bd40d7e 78364132ce
commit cf27200391
8 changed files with 218 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
res/ari/ari_model_validators.c
View File

@@ -366,18 +366,19 @@ int ast_ari_validate_log_channel(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
int has_logging_levels = 0;
int has_configuration = 0;
int has_name = 0;
int has_status = 0;
int has_type = 0;
for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
if (strcmp("logging_levels", ast_json_object_iter_key(iter)) == 0) {
if (strcmp("configuration", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_logging_levels = 1;
prop_is_valid = ast_ari_validate_list(
ast_json_object_iter_value(iter),
ast_ari_validate_string);
has_configuration = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI LogChannel field logging_levels failed validation\n");
ast_log(LOG_ERROR, "ARI LogChannel field configuration failed validation\n");
res = 0;
}
} else
@@ -391,6 +392,26 @@ int ast_ari_validate_log_channel(struct ast_json *json)
res = 0;
}
} else
if (strcmp("status", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_status = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI LogChannel field status failed validation\n");
res = 0;
}
} else
if (strcmp("type", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_type = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI LogChannel field type failed validation\n");
res = 0;
}
} else
{
ast_log(LOG_ERROR,
"ARI LogChannel has undocumented field %s\n",
@@ -399,8 +420,8 @@ int ast_ari_validate_log_channel(struct ast_json *json)
}
}
if (!has_logging_levels) {
ast_log(LOG_ERROR, "ARI LogChannel missing required field logging_levels\n");
if (!has_configuration) {
ast_log(LOG_ERROR, "ARI LogChannel missing required field configuration\n");
res = 0;
}
@@ -409,6 +430,16 @@ int ast_ari_validate_log_channel(struct ast_json *json)
res = 0;
}
if (!has_status) {
ast_log(LOG_ERROR, "ARI LogChannel missing required field status\n");
res = 0;
}
if (!has_type) {
ast_log(LOG_ERROR, "ARI LogChannel missing required field type\n");
res = 0;
}
return res;
}

4
res/ari/ari_model_validators.h
View File

@@ -1302,8 +1302,10 @@ ari_validator ast_ari_validate_application_fn(void);
* - attribute: string (required)
* - value: string (required)
* LogChannel
* - logging_levels: List[string] (required)
* - configuration: string (required)
* - name: string (required)
* - status: string (required)
* - type: string (required)
* Module
* - description: string (required)
* - name: string (required)

23
res/ari/resource_asterisk.c
View File

@@ -653,6 +653,29 @@ void ast_ari_asterisk_rotate_log(struct ast_variable *headers,
ast_ari_response_no_content(response);
}
void ast_ari_asterisk_delete_log(struct ast_variable *headers,
struct ast_ari_asterisk_delete_log_args *args,
struct ast_ari_response *response)
{
int res;
ast_assert(response != NULL);
res = ast_logger_remove_channel(args->log_channel_name);
if (res == AST_LOGGER_FAILURE) {
ast_ari_response_error(response, 404, "Not Found",
"Log channel does not exist");
return;
} else if (res == AST_LOGGER_ALLOC_ERROR) {
ast_ari_response_error(response, 500, "Internal Server Error",
"Allocation failed");
return;
}
ast_ari_response_no_content(response);
}
void ast_ari_asterisk_get_global_var(struct ast_variable *headers,
struct ast_ari_asterisk_get_global_var_args *args,
struct ast_ari_response *response)

13
res/ari/resource_asterisk.h
View File

@@ -194,6 +194,19 @@ struct ast_ari_asterisk_reload_module_args {
* \param[out] response HTTP response
*/
void ast_ari_asterisk_reload_module(struct ast_variable *headers, struct ast_ari_asterisk_reload_module_args *args, struct ast_ari_response *response);
/*! Argument struct for ast_ari_asterisk_delete_log() */
struct ast_ari_asterisk_delete_log_args {
/*! Log channels name */
const char *log_channel_name;
};
/*!
* \brief Deletes a log channel.
*
* \param headers HTTP headers
* \param args Swagger parameters
* \param[out] response HTTP response
*/
void ast_ari_asterisk_delete_log(struct ast_variable *headers, struct ast_ari_asterisk_delete_log_args *args, struct ast_ari_response *response);
/*! Argument struct for ast_ari_asterisk_rotate_log() */
struct ast_ari_asterisk_rotate_log_args {
/*! Log channel's name */

60
res/res_ari_asterisk.c
View File

@@ -718,6 +718,65 @@ static void ast_ari_asterisk_reload_module_cb(
}
#endif /* AST_DEVMODE */
fin: __attribute__((unused))
return;
}
/*!
* \brief Parameter parsing callback for /asterisk/logging/{logChannelName}.
* \param get_params GET parameters in the HTTP request.
* \param path_vars Path variables extracted from the request.
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
static void ast_ari_asterisk_delete_log_cb(
struct ast_tcptls_session_instance *ser,
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct ast_ari_response *response)
{
struct ast_ari_asterisk_delete_log_args args = {};
struct ast_variable *i;
RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
#if defined(AST_DEVMODE)
int is_valid;
int code;
#endif /* AST_DEVMODE */
for (i = path_vars; i; i = i->next) {
if (strcmp(i->name, "logChannelName") == 0) {
args.log_channel_name = (i->value);
} else
{}
}
ast_ari_asterisk_delete_log(headers, &args, response);
#if defined(AST_DEVMODE)
code = response->response_code;
switch (code) {
case 0: /* Implementation is still a stub, or the code wasn't set */
is_valid = response->message == NULL;
break;
case 500: /* Internal Server Error */
case 501: /* Not Implemented */
case 404: /* Log channel does not exist. */
is_valid = 1;
break;
default:
if (200 <= code && code <= 299) {
is_valid = ast_ari_validate_void(
response->message);
} else {
ast_log(LOG_ERROR, "Invalid error response %d for /asterisk/logging/{logChannelName}\n", code);
is_valid = 0;
}
}
if (!is_valid) {
ast_log(LOG_ERROR, "Response validation failed for /asterisk/logging/{logChannelName}\n");
ast_ari_response_error(response, 500,
"Internal Server Error", "Response validation failed");
}
#endif /* AST_DEVMODE */
fin: __attribute__((unused))
return;
}
@@ -1061,6 +1120,7 @@ static struct stasis_rest_handlers asterisk_logging_logChannelName = {
.path_segment = "logChannelName",
.is_wildcard = 1,
.callbacks = {
[AST_HTTP_DELETE] = ast_ari_asterisk_delete_log_cb,
},
.num_children = 1,
.children = { &asterisk_logging_logChannelName_rotate, }