diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-09 23:25:37 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-09 23:25:37 +0000 |
commit | 16cf913517f83940f81c4912bb7603cd44af12ff (patch) | |
tree | 4edf703fb8459581c03e54da97ba755ca75d5725 /cdr/cdr_pgsql.c | |
parent | 225e25988d277dc470b7ae9f6011ba235cf8b304 (diff) |
Add missing option to set calls to be logged in GMT/UTC.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@291038 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr/cdr_pgsql.c')
-rw-r--r-- | cdr/cdr_pgsql.c | 47 |
1 files changed, 37 insertions, 10 deletions
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index 61bd4c8e5..5a69ea79e 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -52,7 +52,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static const char name[] = "pgsql"; static const char config[] = "cdr_pgsql.conf"; -static char *pghostname = NULL, *pgdbname = NULL, *pgdbuser = NULL, *pgpassword = NULL, *pgdbport = NULL, *table = NULL, *encoding = NULL; +static char *pghostname = NULL, *pgdbname = NULL, *pgdbuser = NULL, *pgpassword = NULL, *pgdbport = NULL, *table = NULL, *encoding = NULL, *tz = NULL; static int connected = 0; static int maxsize = 512, maxsize2 = 512; @@ -177,7 +177,7 @@ static int pgsql_log(struct ast_cdr *cdr) } else { /* char, hopefully */ LENGTHEN_BUF2(31); - ast_localtime(&cdr->start, &tm, NULL); + ast_localtime(&cdr->start, &tm, tz); ast_strftime(buf, sizeof(buf), DATE_FORMAT, &tm); ast_str_append(&sql2, 0, "%s%s", first ? "" : ",", buf); } @@ -191,7 +191,7 @@ static int pgsql_log(struct ast_cdr *cdr) } else { /* char, hopefully */ LENGTHEN_BUF2(31); - ast_localtime(&cdr->start, &tm, NULL); + ast_localtime(&cdr->start, &tm, tz); ast_strftime(buf, sizeof(buf), DATE_FORMAT, &tm); ast_str_append(&sql2, 0, "%s%s", first ? "" : ",", buf); } @@ -205,7 +205,7 @@ static int pgsql_log(struct ast_cdr *cdr) } else { /* char, hopefully */ LENGTHEN_BUF2(31); - ast_localtime(&cdr->end, &tm, NULL); + ast_localtime(&cdr->end, &tm, tz); ast_strftime(buf, sizeof(buf), DATE_FORMAT, &tm); ast_str_append(&sql2, 0, "%s%s", first ? "" : ",", buf); } @@ -341,18 +341,30 @@ static int unload_module(void) PQfinish(conn); - if (pghostname) + if (pghostname) { ast_free(pghostname); - if (pgdbname) + } + if (pgdbname) { ast_free(pgdbname); - if (pgdbuser) + } + if (pgdbuser) { ast_free(pgdbuser); - if (pgpassword) + } + if (pgpassword) { ast_free(pgpassword); - if (pgdbport) + } + if (pgdbport) { ast_free(pgdbport); - if (table) + } + if (table) { ast_free(table); + } + if (encoding) { + ast_free(encoding); + } + if (tz) { + ast_free(tz); + } AST_RWLIST_WRLOCK(&psql_columns); while ((current = AST_RWLIST_REMOVE_HEAD(&psql_columns, list))) { @@ -469,6 +481,19 @@ static int config_module(int reload) return -1; } + if (!(tmp = ast_variable_retrieve(cfg, "global", "timezone"))) { + tmp = ""; + } + + if (tz) { + ast_free(tz); + tz = NULL; + } + if (!ast_strlen_zero(tmp) && !(tz = ast_strdup(tmp))) { + ast_config_destroy(cfg); + return -1; + } + if (option_debug) { if (ast_strlen_zero(pghostname)) { ast_debug(1, "using default unix socket\n"); @@ -480,6 +505,8 @@ static int config_module(int reload) ast_debug(1, "got dbname of %s\n", pgdbname); ast_debug(1, "got password of %s\n", pgpassword); ast_debug(1, "got sql table name of %s\n", table); + ast_debug(1, "got encoding of %s\n", encoding); + ast_debug(1, "got timezone of %s\n", tz); } conn = PQsetdbLogin(pghostname, pgdbport, NULL, NULL, pgdbname, pgdbuser, pgpassword); |