diff --git a/src/config.h b/src/config.h index c92a2f5..9475739 100644 --- a/src/config.h +++ b/src/config.h @@ -14,7 +14,7 @@ #define VERSION "1.2.0-master" -#define BUILD 914 +#define BUILD 915 #define HOSTID "mailarchiver" diff --git a/src/counters.c b/src/counters.c index de0e6d6..8941157 100644 --- a/src/counters.c +++ b/src/counters.c @@ -92,7 +92,7 @@ //if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: update counters: %s", sdata->ttmpfile, buf); - p_query(sdata, buf); + p_query(sdata, buf, cfg); } } @@ -115,7 +115,7 @@ else { #endif snprintf(buf, SMALLBUFSIZE-1, "UPDATE `%s` SET `rcvd`=`rcvd`+%llu, `virus`=`virus`+%llu, `duplicate`=`duplicate`+%llu, `ignore`=`ignore`+%llu, `size`=`size`+%llu, `stored_size`=`stored_size`+%llu", SQL_COUNTER_TABLE, counters->c_rcvd, counters->c_virus, counters->c_duplicate, counters->c_ignore, counters->c_size, counters->c_stored_size); - p_query(sdata, buf); + p_query(sdata, buf, cfg); #ifdef HAVE_MEMCACHED } diff --git a/src/import.c b/src/import.c index 647d695..8d41bd7 100644 --- a/src/import.c +++ b/src/import.c @@ -188,12 +188,12 @@ } -void update_import_job_stat(struct session_data *sdata, struct __data *data){ +void update_import_job_stat(struct session_data *sdata, struct __data *data, struct __config *cfg){ char buf[SMALLBUFSIZE]; snprintf(buf, sizeof(buf)-1, "update import set status=%d, started=%ld, updated=%ld, finished=%ld, total=%d, imported=%d where id=%d", data->import->status, data->import->started, data->import->updated, data->import->finished, data->import->total_messages, data->import->processed_messages, data->import->import_job_id); - p_query(sdata, buf); + p_query(sdata, buf, cfg); } diff --git a/src/mysql.c b/src/mysql.c index 2f9ccc7..5460757 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -47,7 +47,9 @@ } -void p_query(struct session_data *sdata, char *s){ +void p_query(struct session_data *sdata, char *s, struct __config *cfg){ + if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: p_query=%s", sdata->ttmpfile, s); + mysql_real_query(&(sdata->mysql), s, strlen(s)); } @@ -210,7 +212,7 @@ int prepare_sql_statement(struct session_data *sdata, MYSQL_STMT **stmt, char *s, struct __config *cfg){ - if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sql=%s", sdata->ttmpfile, s); + if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: prepare statement=%s", sdata->ttmpfile, s); *stmt = mysql_stmt_init(&(sdata->mysql)); if(!*stmt){ diff --git a/src/pilerpurge.c b/src/pilerpurge.c index ff3acff..958fed5 100644 --- a/src/pilerpurge.c +++ b/src/pilerpurge.c @@ -94,7 +94,7 @@ if(dryrun == 1){ printf("running sql query: *%s*\n\n", update_meta_sql); } else { - p_query(sdata, update_meta_sql); + p_query(sdata, update_meta_sql, cfg); } @@ -188,7 +188,7 @@ if(dryrun == 1){ printf("delete sql: *%s*\n", delete_attachment_stmt); } else { - p_query(sdata, delete_attachment_stmt); + p_query(sdata, delete_attachment_stmt, cfg); } } @@ -221,7 +221,7 @@ if(dryrun == 1){ printf("delete sql: *%s*\n", delete_attachment_stmt); } else { - p_query(sdata, delete_attachment_stmt); + p_query(sdata, delete_attachment_stmt, cfg); } } @@ -402,7 +402,7 @@ if(purged_size > 100){ snprintf(buf, sizeof(buf)-1, "UPDATE `%s` SET size = size - %ld", SQL_COUNTER_TABLE, purged_size); - if(dryrun == 0) p_query(&sdata, buf); + if(dryrun == 0) p_query(&sdata, buf, &cfg); } diff --git a/src/sql.h b/src/sql.h index 07c214c..e57671f 100644 --- a/src/sql.h +++ b/src/sql.h @@ -9,7 +9,7 @@ int open_database(struct session_data *sdata, struct __config *cfg); void close_database(struct session_data *sdata); int prepare_sql_statement(struct session_data *sdata, MYSQL_STMT **stmt, char *s, struct __config *cfg); -void p_query(struct session_data *sdata, char *s); +void p_query(struct session_data *sdata, char *s, struct __config *cfg); int p_exec_query(struct session_data *sdata, MYSQL_STMT *stmt, struct __data *data); int p_store_results(struct session_data *sdata, MYSQL_STMT *stmt, struct __data *data); int p_fetch_results(MYSQL_STMT *stmt);