diff options
author | Edward Rudd <urkle@outoforder.cc> | 2008-10-26 01:53:49 (GMT) |
---|---|---|
committer | Edward Rudd <urkle@outoforder.cc> | 2008-10-26 01:53:49 (GMT) |
commit | fc70e99444b2852f45303d9bf55332f247ec6b4f (patch) | |
tree | b74c53e122b67b9b6b82ddbdf02c4fb12e9236de /utility/shell.c | |
parent | ede07b5bec9a17f2fe208abdf12e72209b79780c (diff) |
finish transaction implementation
if a single log file aborts DO NOT keep going
switch to using libtool for linking (so rpath is set)
Diffstat (limited to 'utility/shell.c')
-rw-r--r-- | utility/shell.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/utility/shell.c b/utility/shell.c index 3de65b3..5f011a6 100644 --- a/utility/shell.c +++ b/utility/shell.c | |||
@@ -21,7 +21,7 @@ const apr_getopt_option_t _opt_config[] = { | |||
21 | {"config", 'c', 1, "Configuration file to use (default mod_log_sql.conf)"}, | 21 | {"config", 'c', 1, "Configuration file to use (default mod_log_sql.conf)"}, |
22 | {"dryrun", 'n', 0, "Perform a dry run (do not actually alter the databse)"}, | 22 | {"dryrun", 'n', 0, "Perform a dry run (do not actually alter the databse)"}, |
23 | {"dump", 'd', 0, "Dump the configuration after parsing and quit"}, | 23 | {"dump", 'd', 0, "Dump the configuration after parsing and quit"}, |
24 | {"loglevel", 'l', 1, "Log Level (deubg, warn, error)"}, | 24 | {"loglevel", 'l', 1, "Log Level (deubg, notice, error)"}, |
25 | {"summary", 's', 1, "Summary (yes,no)"}, | 25 | {"summary", 's', 1, "Summary (yes,no)"}, |
26 | {"help", 'h', 0, "Show Help"}, | 26 | {"help", 'h', 0, "Show Help"}, |
27 | {NULL} | 27 | {NULL} |
@@ -170,7 +170,12 @@ int main(int argc, const char *const argv[]) | |||
170 | int f, l; | 170 | int f, l; |
171 | filelist = (char **)cfg->input_files->elts; | 171 | filelist = (char **)cfg->input_files->elts; |
172 | for (f=0, l=cfg->input_files->nelts; f < l; f++) { | 172 | for (f=0, l=cfg->input_files->nelts; f < l; f++) { |
173 | parse_logfile(cfg, filelist[f]); | 173 | rv = parse_logfile(cfg, filelist[f]); |
174 | if (rv) { | ||
175 | logging_log(cfg, LOGLEVEL_NOISE, | ||
176 | "Error occured parsing log files. Aborting"); | ||
177 | break; | ||
178 | } | ||
174 | } | 179 | } |
175 | } else { | 180 | } else { |
176 | logging_log(cfg,LOGLEVEL_NOISE,"No log files found to parse"); | 181 | logging_log(cfg,LOGLEVEL_NOISE,"No log files found to parse"); |