diff options
author | Edward Rudd | 2008-10-28 03:03:14 +0000 |
---|---|---|
committer | Edward Rudd | 2008-10-28 03:03:14 +0000 |
commit | de35749bba759449cc9c972d0345b18a3ca7acbb (patch) | |
tree | 2a9b516717036047a6cfa6d8da6bd7d2e4c2ac29 /utility | |
parent | 76272812c00f6116bc7bf42eaed31b6c4d743497 (diff) |
fix dry running.
Diffstat (limited to 'utility')
-rw-r--r-- | utility/logparse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utility/logparse.c b/utility/logparse.c index afb1824..67f51b6 100644 --- a/utility/logparse.c +++ b/utility/logparse.c | |||
@@ -361,7 +361,7 @@ apr_status_t parser_parsefile(config_t *cfg, config_filestat_t *fstat) | |||
361 | fstat->linesparsed = 0; | 361 | fstat->linesparsed = 0; |
362 | // Start Transaction | 362 | // Start Transaction |
363 | fstat->start = apr_time_now(); | 363 | fstat->start = apr_time_now(); |
364 | if (database_trans_start(cfg,tp)) { | 364 | if (!cfg->dryrun && database_trans_start(cfg,tp)) { |
365 | fstat->result = "Database Transaction Error"; | 365 | fstat->result = "Database Transaction Error"; |
366 | fstat->stop = apr_time_now(); | 366 | fstat->stop = apr_time_now(); |
367 | return rv; | 367 | return rv; |
@@ -405,7 +405,7 @@ apr_status_t parser_parsefile(config_t *cfg, config_filestat_t *fstat) | |||
405 | rv = parser_processline(targp, cfg, fstat, targv, targc); | 405 | rv = parser_processline(targp, cfg, fstat, targv, targc); |
406 | if (rv != APR_SUCCESS) { | 406 | if (rv != APR_SUCCESS) { |
407 | int i; | 407 | int i; |
408 | database_trans_abort(cfg); | 408 | if (!cfg->dryrun) database_trans_abort(cfg); |
409 | logging_log(cfg, LOGLEVEL_ERROR, "Line %d(%d): %s", fstat->linesparsed, | 409 | logging_log(cfg, LOGLEVEL_ERROR, "Line %d(%d): %s", fstat->linesparsed, |
410 | targc, buff); | 410 | targc, buff); |
411 | for (i = 0; targv[i]; i++) { | 411 | for (i = 0; targv[i]; i++) { |
@@ -420,7 +420,7 @@ apr_status_t parser_parsefile(config_t *cfg, config_filestat_t *fstat) | |||
420 | } while (rv == APR_SUCCESS); | 420 | } while (rv == APR_SUCCESS); |
421 | apr_file_close(file); | 421 | apr_file_close(file); |
422 | // Finish Transaction | 422 | // Finish Transaction |
423 | if (database_trans_stop(cfg,tp)) { | 423 | if (!cfg->dryrun && database_trans_stop(cfg,tp)) { |
424 | fstat->result = apr_psprintf(cfg->pool, | 424 | fstat->result = apr_psprintf(cfg->pool, |
425 | "Input line %d, Database Transaction Error", | 425 | "Input line %d, Database Transaction Error", |
426 | fstat->linesparsed); | 426 | fstat->linesparsed); |