diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-09-21 17:26:35 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-09-21 17:26:35 -0500 |
| commit | 94b705f9fbed1a7d226dd3a08a6cfaaff668cfb3 (patch) | |
| tree | ccacc7eeebea6e481f3a4b7353b44caf9717e650 | |
| parent | 81bb67286183a35c5754e3ccd815523ae3e67758 (diff) | |
| parent | 42cc267016229a7d6e9d525c860ff303912220cc (diff) | |
Merge "cdr_mysql: fix UTC support" into 13
| -rw-r--r-- | addons/cdr_mysql.c | 11 | ||||
| -rw-r--r-- | configs/samples/cdr_mysql.conf.sample | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c index 4fb3ce54f..4621143fe 100644 --- a/addons/cdr_mysql.c +++ b/addons/cdr_mysql.c @@ -250,7 +250,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 { @@ -265,8 +265,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")) && @@ -278,6 +277,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 { diff --git a/configs/samples/cdr_mysql.conf.sample b/configs/samples/cdr_mysql.conf.sample index 04b70493b..e15a8ed93 100644 --- a/configs/samples/cdr_mysql.conf.sample +++ b/configs/samples/cdr_mysql.conf.sample @@ -18,7 +18,10 @@ ;user=asteriskcdruser ;port=3306 ;sock=/tmp/mysql.sock -;timezone=UTC ; Previously called usegmtime +; By default CDRs are logged in the system's time zone +;cdrzone=UTC ; log CDRs with UTC +;usegmtime=yes ;log date/time in GMT. Default is "no" +;cdrzone=America/New_York ; or use a specific time zone ; ; If your system's locale differs from mysql database character set, ; cdr_mysql can damage non-latin characters in CDR variables. Use this |