Add missing option to set calls to be logged in GMT/UTC.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@291038 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 61bd4c8e51ae0f6152bb685ea42b269047ed33bf..5a69ea79e9036930e48ab61e5a0e97dc22a537de 100644 (file)
--- 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);

diff --git a/configs/cdr_pgsql.conf.sample b/configs/cdr_pgsql.conf.sample
index 2c46663268cfede490c34d3b5a0cd3654f366b86..7a909105fe524c547f35224491c89f2d3983a263 100644 (file)
--- a/configs/cdr_pgsql.conf.sample
+++ b/configs/cdr_pgsql.conf.sample
@@ -12,3 +12,4 @@
 ;user=postgres
 ;table=cdr             ;SQL table where CDRs will be inserted
 ;encoding=LATIN9       ; Encoding of logged characters in Asterisk
+;timezone=UTC          ; Uncomment if you want datetime fields in UTC/GMT