kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARI: Retrieve existing log channels

Browse Source 
An http request can be sent to get the existing Asterisk logs.

The command "curl -v -u user:pass -X GET 'http://localhost:8088
/ari/asterisk/logging'" can be run in the terminal to access the
newly implemented functionality.

* Retrieve all existing log channels

ASTERISK-25252

Change-Id: I7bb08b93e3b938c991f3f56cc5d188654768a808
This commit is contained in:
Scott Emidy
2015-08-07 14:20:29 -05:00
parent e9f1bc08cb
commit df9ce36366
6 changed files with 190 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
main/logger.c
View File

@@ -936,11 +936,11 @@ int ast_logger_rotate()
int ast_logger_rotate_channel(const char *log_channel)
{
struct logchannel *f;
int success = 0;
int success = AST_LOGGER_FAILURE;
struct ast_str *filename = ast_str_create(64);
if (!filename) {
return -1;
return AST_LOGGER_ALLOC_ERROR;
}
ast_str_append(&filename, 0, "%s/%s", ast_config_AST_LOG_DIR, log_channel);
@@ -960,7 +960,7 @@ int ast_logger_rotate_channel(const char *log_channel)
f->fileptr = NULL;
if (strcmp(ast_str_buffer(filename), f->filename) == 0) {
rotate_file(f->filename);
success = 1;
success = AST_LOGGER_SUCCESS;
}
}
}
@@ -1015,6 +1015,48 @@ static char *handle_logger_set_level(struct ast_cli_entry *e, int cmd, struct as
return CLI_SUCCESS;
}
int ast_logger_get_channels(int (*logentry)(const char *channel, const char *type,
const char *status, const char *configuration, void *data), void *data)
{
struct logchannel *chan;
struct ast_str *configs = ast_str_create(64);
int res = AST_LOGGER_SUCCESS;
if (!configs) {
return AST_LOGGER_ALLOC_ERROR;
}
AST_RWLIST_RDLOCK(&logchannels);
AST_RWLIST_TRAVERSE(&logchannels, chan, list) {
unsigned int level;
ast_str_reset(configs);
for (level = 0; level < ARRAY_LEN(levels); level++) {
if ((chan->logmask & (1 << level)) && levels[level]) {
ast_str_append(&configs, 0, "%s ", levels[level]);
}
}
res = logentry(chan->filename, chan->type == LOGTYPE_CONSOLE ? "Console" :
(chan->type == LOGTYPE_SYSLOG ? "Syslog" : "File"), chan->disabled ?
"Disabled" : "Enabled", ast_str_buffer(configs), data);
if (res) {
AST_RWLIST_UNLOCK(&logchannels);
ast_free(configs);
configs = NULL;
return AST_LOGGER_FAILURE;
}
}
AST_RWLIST_UNLOCK(&logchannels);
ast_free(configs);
configs = NULL;
return AST_LOGGER_SUCCESS;
}
/*! \brief CLI command to show logging system configuration */
static char *handle_logger_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{