kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 03:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add queue_log_realtime_use_gmt option to logger.conf

Browse Source 
Add an option that lets you specify that the timestamps going into the realtime
queue log should be in GMT instead of local time.

Review: https://reviewboard.asterisk.org/r/2287/



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2013-01-28 01:50:54 +00:00
parent 6c74483227
commit dfdf3d9909
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -67,6 +67,9 @@ Logging
individual queue, the PAUSEALL/UNPAUSEALL event will only be logged if at individual queue, the PAUSEALL/UNPAUSEALL event will only be logged if at
least one member of any queue exists for that interface. least one member of any queue exists for that interface.
* Added the 'queue_log_realtime_use_gmt' option to have timestamps in GMT
for realtime queue log entries.
Queue Queue
------------------- -------------------
* Add queue available hint. exten => 8501,hint,Queue:markq_avail * Add queue available hint. exten => 8501,hint,Queue:markq_avail

4
configs/logger.conf.sample
View File

@@ -39,6 +39,10 @@
; (defaults to queue_log) ; (defaults to queue_log)
;queue_log_name = queue_log ;queue_log_name = queue_log
; ;
; When using realtime for the queue log, use GMT for the timestamp
; instead of localtime. The default of this option is 'no'.
;queue_log_realtime_use_gmt = yes
;
; Log rotation strategy: ; Log rotation strategy:
; none: Do not perform any logrotation at all. You should make ; none: Do not perform any logrotation at all. You should make
; very sure to set up some external logrotate mechanism ; very sure to set up some external logrotate mechanism

6
main/logger.c
View File

@@ -111,6 +111,7 @@ static struct {
unsigned int queue_log:1; unsigned int queue_log:1;
unsigned int queue_log_to_file:1; unsigned int queue_log_to_file:1;
unsigned int queue_adaptive_realtime:1; unsigned int queue_adaptive_realtime:1;
unsigned int queue_log_realtime_use_gmt:1;
} logfiles = { 1 }; } logfiles = { 1 };
static char hostname[MAXHOSTNAMELEN]; static char hostname[MAXHOSTNAMELEN];
@@ -427,6 +428,9 @@ static void init_logger_chain(int locked, const char *altconf)
if ((s = ast_variable_retrieve(cfg, "general", "queue_log_name"))) { if ((s = ast_variable_retrieve(cfg, "general", "queue_log_name"))) {
ast_copy_string(queue_log_name, s, sizeof(queue_log_name)); ast_copy_string(queue_log_name, s, sizeof(queue_log_name));
} }
if ((s = ast_variable_retrieve(cfg, "general", "queue_log_realtime_use_gmt"))) {
logfiles.queue_log_realtime_use_gmt = ast_true(s);
}
if ((s = ast_variable_retrieve(cfg, "general", "exec_after_rotate"))) { if ((s = ast_variable_retrieve(cfg, "general", "exec_after_rotate"))) {
ast_copy_string(exec_after_rotate, s, sizeof(exec_after_rotate)); ast_copy_string(exec_after_rotate, s, sizeof(exec_after_rotate));
} }
@@ -554,7 +558,7 @@ void ast_queue_log(const char *queuename, const char *callid, const char *agent,
if (ast_check_realtime("queue_log")) { if (ast_check_realtime("queue_log")) {
tv = ast_tvnow(); tv = ast_tvnow();
ast_localtime(&tv, &tm, NULL); ast_localtime(&tv, &tm, logfiles.queue_log_realtime_use_gmt ? "GMT" : NULL);
ast_strftime(time_str, sizeof(time_str), "%F %T.%6q", &tm); ast_strftime(time_str, sizeof(time_str), "%F %T.%6q", &tm);
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf(qlog_msg, sizeof(qlog_msg), fmt, ap); vsnprintf(qlog_msg, sizeof(qlog_msg), fmt, ap);