kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-13 21:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 91366 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r91366 | oej | 2007-12-06 13:54:11 +0100 (Tor, 06 Dec 2007) | 4 lines

Make sure logger is reloaded at general reload in the cli.

(Discovered during Asterisk training in Portugal)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91384 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2007-12-06 14:23:12 +00:00
parent 7e38b474d9
commit 9dc965eadd
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/asterisk/logger.h
View File

@@ -63,6 +63,9 @@ void ast_log(int level, const char *file, int line, const char *function, const
void ast_backtrace(void); void ast_backtrace(void);
/*! \brief Reload logger without rotating log files */
int logger_reload(void);
void ast_queue_log(const char *queuename, const char *callid, const char *agent, const char *event, const char *fmt, ...) void ast_queue_log(const char *queuename, const char *callid, const char *agent, const char *event, const char *fmt, ...)
__attribute__ ((format (printf, 5, 6))); __attribute__ ((format (printf, 5, 6)));

1
main/loader.c
View File

@@ -251,6 +251,7 @@ static struct reload_classes {
{ "manager", reload_manager }, { "manager", reload_manager },
{ "rtp", ast_rtp_reload }, { "rtp", ast_rtp_reload },
{ "http", ast_http_reload }, { "http", ast_http_reload },
{ "logger", logger_reload },
{ NULL, NULL } { NULL, NULL }
}; };

17
main/logger.c
View File

@@ -616,6 +616,15 @@ static int reload_logger(int rotate)
return res; return res;
} }
/*! \brief Reload the logger module without rotating log files (also used from loader.c during
a full Asterisk reload) */
int logger_reload(void)
{
if(reload_logger(0))
return RESULT_FAILURE;
return RESULT_SUCCESS;
}
static char *handle_logger_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_logger_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
switch (cmd) { switch (cmd) {
@@ -631,8 +640,8 @@ static char *handle_logger_reload(struct ast_cli_entry *e, int cmd, struct ast_c
if (reload_logger(0)) { if (reload_logger(0)) {
ast_cli(a->fd, "Failed to reload the logger\n"); ast_cli(a->fd, "Failed to reload the logger\n");
return CLI_FAILURE; return CLI_FAILURE;
} else }
return CLI_SUCCESS; return CLI_SUCCESS;
} }
static char *handle_logger_rotate(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_logger_rotate(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -650,8 +659,8 @@ static char *handle_logger_rotate(struct ast_cli_entry *e, int cmd, struct ast_c
if (reload_logger(1)) { if (reload_logger(1)) {
ast_cli(a->fd, "Failed to reload the logger and rotate log files\n"); ast_cli(a->fd, "Failed to reload the logger and rotate log files\n");
return CLI_FAILURE; return CLI_FAILURE;
} else }
return CLI_SUCCESS; return CLI_SUCCESS;
} }
/*! \brief CLI command to show logging system configuration */ /*! \brief CLI command to show logging system configuration */