kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 288267 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r288267 | tilghman | 2010-09-22 10:11:09 -0500 (Wed, 22 Sep 2010) | 23 lines
  
  Merged revisions 288265-288266 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r288265 | tilghman | 2010-09-22 09:48:04 -0500 (Wed, 22 Sep 2010) | 9 lines
    
    Allow the encoding to be set, in case local charset does not agree with database.
    
    (closes issue #16940)
     Reported by: jamicque
     Patches: 
           20100827__issue16940.diff.txt uploaded by tilghman (license 14)
           20100921__issue16940__1.6.2.diff.txt uploaded by tilghman (license 14)
     Tested by: jamicque
  ........
    r288266 | tilghman | 2010-09-22 10:04:52 -0500 (Wed, 22 Sep 2010) | 5 lines
    
    Document addition of encoding parameter.
    
    (issue #16940)
    Reported by: jamicque
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@288268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-09-22 15:14:02 +00:00
parent e2ceeb5789
commit 43a8a2dcad
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cdr/cdr_pgsql.c
View File

@@ -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;
static char *pghostname = NULL, *pgdbname = NULL, *pgdbuser = NULL, *pgpassword = NULL, *pgdbport = NULL, *table = NULL, *encoding = NULL;
static int connected = 0;
static int maxsize = 512, maxsize2 = 512;
@@ -110,6 +110,9 @@ static int pgsql_log(struct ast_cdr *cdr)
conn = PQsetdbLogin(pghostname, pgdbport, NULL, NULL, pgdbname, pgdbuser, pgpassword);
if (PQstatus(conn) != CONNECTION_BAD) {
connected = 1;
if (PQsetClientEncoding(conn, encoding)) {
ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default '%s'\n", encoding, pg_encoding_to_char(PQclientEncoding(conn)));
}
} else {
pgerror = PQerrorMessage(conn);
ast_log(LOG_ERROR, "Unable to connect to database server %s. Calls will not be logged!\n", pghostname);
@@ -449,6 +452,19 @@ static int config_module(int reload)
return -1;
}
if (!(tmp = ast_variable_retrieve(cfg, "global", "encoding"))) {
ast_log(LOG_WARNING, "Encoding not specified. Assuming LATIN9\n");
tmp = "LATIN9";
}
if (encoding) {
ast_free(encoding);
}
if (!(encoding = 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");
@@ -469,6 +485,9 @@ static int config_module(int reload)
int i, rows, version;
ast_debug(1, "Successfully connected to PostgreSQL database.\n");
connected = 1;
if (PQsetClientEncoding(conn, encoding)) {
ast_log(LOG_WARNING, "Failed to set encoding to '%s'. Encoding set to default '%s'\n", encoding, pg_encoding_to_char(PQclientEncoding(conn)));
}
version = PQserverVersion(conn);
if (version >= 70300) {