if a hostname is not specified, connect over a unix socket instead of
authorRussell Bryant <russell@russellbryant.com>
Sat, 20 May 2006 00:57:04 +0000 (00:57 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sat, 20 May 2006 00:57:04 +0000 (00:57 +0000)
connecting to localhost (issue #7145, Mithraen)

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

cdr/cdr_pgsql.c

index 492301a..6af1a93 100644 (file)
@@ -222,8 +222,8 @@ static int process_my_load_module(struct ast_config *cfg)
 
        tmp = ast_variable_retrieve(cfg,"global","hostname");
        if (tmp == NULL) {
 
        tmp = ast_variable_retrieve(cfg,"global","hostname");
        if (tmp == NULL) {
-               ast_log(LOG_WARNING,"PostgreSQL server hostname not specified.  Assuming localhost\n");
-               tmp = "localhost";
+               ast_log(LOG_WARNING,"PostgreSQL server hostname not specified.  Assuming unix socket connection\n");
+               tmp = "";       /* connect via UNIX-socket by default */
        }
        pghostname = strdup(tmp);
        if (pghostname == NULL) {
        }
        pghostname = strdup(tmp);
        if (pghostname == NULL) {
@@ -287,10 +287,11 @@ static int process_my_load_module(struct ast_config *cfg)
        }
 
        if (option_debug) {
        }
 
        if (option_debug) {
-               ast_log(LOG_DEBUG, "cdr_pgsql: got hostname of %s\n", pghostname);
+               if (ast_strlen_zero(pghostname))
+                       ast_log(LOG_DEBUG, "cdr_pgsql: using default unix socket\n");
+               else
+                       ast_log(LOG_DEBUG, "cdr_pgsql: got hostname of %s\n", pghostname);
                ast_log(LOG_DEBUG, "cdr_pgsql: got port of %s\n", pgdbport);
                ast_log(LOG_DEBUG, "cdr_pgsql: got port of %s\n", pgdbport);
-               if (pgdbsock)
-                       ast_log(LOG_DEBUG, "cdr_pgsql: got sock file of %s\n", pgdbsock);
                ast_log(LOG_DEBUG, "cdr_pgsql: got user of %s\n", pgdbuser);
                ast_log(LOG_DEBUG, "cdr_pgsql: got dbname of %s\n", pgdbname);
                ast_log(LOG_DEBUG, "cdr_pgsql: got password of %s\n", pgpassword);
                ast_log(LOG_DEBUG, "cdr_pgsql: got user of %s\n", pgdbuser);
                ast_log(LOG_DEBUG, "cdr_pgsql: got dbname of %s\n", pgdbname);
                ast_log(LOG_DEBUG, "cdr_pgsql: got password of %s\n", pgpassword);