bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2026-04-05 18:19:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

preparing for database consolidation

Browse Source
This commit is contained in:
SJ
2013-04-28 14:18:09 +02:00
parent 8e27aea28d
commit 742aa27260
11 changed files with 49 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/piler.c
View File

@@ -317,9 +317,7 @@ void initialise_configuration(){
}
#endif
mysql_init(&(sdata.mysql));
mysql_options(&(sdata.mysql), MYSQL_OPT_CONNECT_TIMEOUT, (const char*)&cfg.mysql_connect_timeout);
if(mysql_real_connect(&(sdata.mysql), cfg.mysqlhost, cfg.mysqluser, cfg.mysqlpwd, cfg.mysqldb, cfg.mysqlport, cfg.mysqlsocket, 0) == 0){
if(open_database(&sdata, &cfg) == ERR){
syslog(LOG_PRIORITY, "cannot connect to mysql server");
return;
}
@@ -331,7 +329,7 @@ void initialise_configuration(){
if(cfg.server_id > 0) insert_offset(&sdata, cfg.server_id);
mysql_close(&(sdata.mysql));
close_database(&sdata);
syslog(LOG_PRIORITY, "reloaded config: %s", configfile);