minor fixes

Change-Id: I0b6c8c53bbe65c3a6f4b01b64c6883b8560acfbd
Signed-off-by: SJ <sj@acts.hu>
This commit is contained in:
SJ 2016-10-28 20:00:46 +02:00
parent bedc1830d2
commit e6e83a1635
2 changed files with 3 additions and 8 deletions

View File

@ -94,7 +94,7 @@ struct _parse_rule config_parse_rules[] =
{ "mysqlpwd", "string", (void*) string_parser, offsetof(struct __config, mysqlpwd), "", MAXVAL-1}, { "mysqlpwd", "string", (void*) string_parser, offsetof(struct __config, mysqlpwd), "", MAXVAL-1},
{ "mysqldb", "string", (void*) string_parser, offsetof(struct __config, mysqldb), "piler", MAXVAL-1}, { "mysqldb", "string", (void*) string_parser, offsetof(struct __config, mysqldb), "piler", MAXVAL-1},
{ "mysql_connect_timeout", "integer", (void*) int_parser, offsetof(struct __config, mysql_connect_timeout), "2", sizeof(int)}, { "mysql_connect_timeout", "integer", (void*) int_parser, offsetof(struct __config, mysql_connect_timeout), "2", sizeof(int)},
{ "number_of_worker_processes", "integer", (void*) int_parser, offsetof(struct __config, number_of_worker_processes), "10", sizeof(int)}, { "number_of_worker_processes", "integer", (void*) int_parser, offsetof(struct __config, number_of_worker_processes), "2", sizeof(int)},
{ "pemfile", "string", (void*) string_parser, offsetof(struct __config, pemfile), "", MAXVAL-1}, { "pemfile", "string", (void*) string_parser, offsetof(struct __config, pemfile), "", MAXVAL-1},
{ "pidfile", "string", (void*) string_parser, offsetof(struct __config, pidfile), PIDFILE, MAXVAL-1}, { "pidfile", "string", (void*) string_parser, offsetof(struct __config, pidfile), PIDFILE, MAXVAL-1},
{ "piler_header_field", "string", (void*) string_parser, offsetof(struct __config, piler_header_field), "X-piler-id:", MAXVAL-1}, { "piler_header_field", "string", (void*) string_parser, offsetof(struct __config, piler_header_field), "X-piler-id:", MAXVAL-1},

View File

@ -106,11 +106,6 @@ int process_email(char *filename, struct session_data *sdata, struct __data *dat
snprintf(sdata->filename, SMALLBUFSIZE-1, "%s", filename); snprintf(sdata->filename, SMALLBUFSIZE-1, "%s", filename);
/*if(data->import->extra_recipient){
snprintf(sdata->rcptto[0], SMALLBUFSIZE-1, "%s", data->import->extra_recipient);
sdata->num_of_rcpt_to = 1;
}*/
parser_state = parse_message(sdata, 1, data, cfg); parser_state = parse_message(sdata, 1, data, cfg);
post_parse(sdata, &parser_state, cfg); post_parse(sdata, &parser_state, cfg);
@ -161,9 +156,9 @@ int process_email(char *filename, struct session_data *sdata, struct __data *dat
gettimeofday(&tv2, &tz); gettimeofday(&tv2, &tz);
syslog(LOG_PRIORITY, "%s: from=%s, size=%d/%d, attachments=%d, reference=%s, " syslog(LOG_PRIORITY, "%s: size=%d/%d, attachments=%d, reference=%s, "
"message-id=%s, retention=%d, folder=%d, delay=%.4f, status=%s", "message-id=%s, retention=%d, folder=%d, delay=%.4f, status=%s",
filename, sdata->fromemail, sdata->tot_len, sdata->stored_len, filename, sdata->tot_len, sdata->stored_len,
parser_state.n_attachments, parser_state.reference, parser_state.message_id, parser_state.n_attachments, parser_state.reference, parser_state.message_id,
parser_state.retention, data->folder, tvdiff(tv2,tv1)/1000000.0, status); parser_state.retention, data->folder, tvdiff(tv2,tv1)/1000000.0, status);