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

0.1.5

Browse Source
This commit is contained in:
SJ
2011-11-19 21:25:44 +01:00
parent 29f312a8d2
commit d7318f94cf
17 changed files with 510 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/piler.c
View File

@@ -38,6 +38,8 @@ struct passwd *pwd;
void clean_exit(){
if(sd != -1) close(sd);
free_rule(data.rules);
syslog(LOG_PRIORITY, "%s has been terminated", PROGNAME);
unlink(cfg.pidfile);
@@ -61,7 +63,8 @@ void sigchld(){
}
void initialiseConfiguration(){
void initialise_configuration(){
struct session_data sdata;
cfg = read_config(configfile);
@@ -84,7 +87,21 @@ void initialiseConfiguration(){
setlocale(LC_MESSAGES, cfg.locale);
setlocale(LC_CTYPE, cfg.locale);
data.blackhole = NULL;
free_rule(data.rules);
data.rules = NULL;
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){
syslog(LOG_PRIORITY, "cannot connect to mysql server");
return;
}
load_archiving_rules(&sdata, &(data.rules));
mysql_close(&(sdata.mysql));
syslog(LOG_PRIORITY, "reloaded config: %s", configfile);
@@ -147,17 +164,17 @@ int main(int argc, char **argv){
sig_catch(SIGQUIT, clean_exit);
sig_catch(SIGKILL, clean_exit);
sig_catch(SIGTERM, clean_exit);
sig_catch(SIGHUP, initialiseConfiguration);
sig_catch(SIGHUP, initialise_configuration);
data.blackhole = NULL;
data.rules = NULL;
sig_block(SIGCHLD);
sig_catch(SIGCHLD, sigchld);
initialiseConfiguration();
initialise_configuration();
if(read_key(&cfg)) fatal(ERR_READING_KEY);