From d3ddf4b0fdaf3e9562ede947c2367031434b3b5e Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Mon, 12 Sep 2016 15:37:30 +0300 Subject: cdr_mysql: fix UTC support * Make 'cdrzone=UTC' work properly. * Fix the documentation of cdr_mysql.conf: it's cdrzone and not timezone ASTERISK-26359 #close Change-Id: I2a6f67b71bbbe77cac31a34d0bbfb1d67c933778 --- addons/cdr_mysql.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'addons') diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c index 9873395c2..896bad603 100644 --- a/addons/cdr_mysql.c +++ b/addons/cdr_mysql.c @@ -245,7 +245,7 @@ db_reconnect: struct ast_tm tm; char timestr[128]; ast_localtime(&tv, &tm, ast_str_strlen(cdrzone) ? ast_str_buffer(cdrzone) : NULL); - ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %T", &tm); + ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, &tm); value = ast_strdupa(timestr); cdrname = "calldate"; } else { @@ -260,8 +260,7 @@ db_reconnect: /* Need the type and value to determine if we want the raw value or not */ if (entry->staticvalue) { value = ast_strdupa(entry->staticvalue); - } else if ((!strcmp(cdrname, "start") || - !strcmp(cdrname, "answer") || + } else if ((!strcmp(cdrname, "answer") || !strcmp(cdrname, "end") || !strcmp(cdrname, "disposition") || !strcmp(cdrname, "amaflags")) && @@ -273,6 +272,12 @@ db_reconnect: strstr(entry->type, "numeric") || strstr(entry->type, "fixed"))) { ast_cdr_format_var(cdr, cdrname, &value, workspace, sizeof(workspace), 1); + } else if (!strcmp(cdrname, "start")) { + struct ast_tm tm; + char timestr[128]; + ast_localtime(&cdr->start, &tm, ast_str_strlen(cdrzone) ? ast_str_buffer(cdrzone) : NULL); + ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, &tm); + value = ast_strdupa(timestr); } else if (!strcmp(cdrname, "calldate")) { /* Skip calldate - the value has already been dup'd */ } else { -- cgit v1.2.3