Merged revisions 265894 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r265894 | tilghman | 2010-05-26 11:14:48 -0500 (Wed, 26 May 2010) | 8 lines

  Construct socket name, according to the Postgres docs, and document as such.

  (closes issue #17392)
   Reported by: dps
   Patches:
         20100525__issue17392.diff.txt uploaded by tilghman (license 14)
   Tested by: dps
........

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

diff --git a/configs/res_pgsql.conf.sample b/configs/res_pgsql.conf.sample
index cfb8538bd857b49c9baf54ff8497a9a434d265c3..b889244a7e7214623fde1954742c451e43e8605d 100644 (file)
--- a/configs/res_pgsql.conf.sample
+++ b/configs/res_pgsql.conf.sample
@@ -13,6 +13,13 @@ dbname=asterisk
 dbuser=asterisk
 dbpass=password
 ;
+; dbsock is specified as the directory where the socket file may be found. The
+; actual socket is constructed as a combination of dbsock and dbport.  For
+; example, the values of '/tmp' and '5432', respectively, will specify a socket
+; file of '/tmp/.s.PGSQL.5432'.
+; 
+;dbsock=/tmp
+;
 ; requirements - At startup, each realtime family will make requirements
 ; on the backend.  There are several strategies for handling requirements:
 ; warn        - Warn if the required column does not exist.

diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 7d53d6a59f16649de62f1cf03e710b35ac8ef90b..fd0844571cd9ba567fc1d71e0e142c84babc6e31 100644 (file)
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -1391,8 +1391,8 @@ static int parse_config(int is_reload)
                /* No socket needed */
        } else if (!(s = ast_variable_retrieve(config, "general", "dbsock"))) {
                ast_log(LOG_WARNING,
-                               "PostgreSQL RealTime: No database socket found, using '/tmp/pgsql.sock' as default.\n");
-               strcpy(dbsock, "/tmp/pgsql.sock");
+                               "PostgreSQL RealTime: No database socket found, using '/tmp/.s.PGSQL.%d' as default.\n", dbport);
+               strcpy(dbsock, "/tmp");
        } else {
                ast_copy_string(dbsock, s, sizeof(dbsock));
        }
@@ -1453,7 +1453,7 @@ static int pgsql_reconnect(const char *database)
                struct ast_str *connInfo = ast_str_create(32);
 
                ast_str_set(&connInfo, 0, "host=%s port=%d dbname=%s user=%s",
-                       dbhost, dbport, my_database, dbuser);
+                       S_OR(dbhost, dbsock), dbport, my_database, dbuser);
                if (!ast_strlen_zero(dbpass))
                        ast_str_append(&connInfo, 0, " password=%s", dbpass);