emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cache_check] tweak exception handling; there was a window where they weren't caught

Browse Source
This commit is contained in:
Joe Thornber 2013-10-11 11:04:06 +01:00
parent 3a0e07e921
commit 764ee0b0c5
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
caching/cache_check.cc
View File

@ -276,17 +276,25 @@ namespace {
throw runtime_error(msg.str()); throw runtime_error(msg.str());
} }
block_manager<>::ptr bm = open_bm(path, block_io<>::READ_ONLY);
err = metadata_check(bm, fs);
return err == NO_ERROR ? 0 : 1;
}
int check_with_exception_handling(string const &path, flags const &fs) {
int r;
try { try {
block_manager<>::ptr bm = open_bm(path, block_io<>::READ_ONLY); r = check(path, fs);
err = metadata_check(bm, fs);
} catch (std::exception &e) { } catch (std::exception &e) {
if (!fs.quiet_) if (!fs.quiet_)
cerr << e.what() << endl; cerr << e.what() << endl;
return 1; r = 1;
} }
return err == NO_ERROR ? 0 : 1; return r;
} }
void usage(ostream &out, string const &cmd) { void usage(ostream &out, string const &cmd) {
@ -363,7 +371,7 @@ int main(int argc, char **argv)
return 1; return 1;
} }
return check(argv[optind], fs); return check_with_exception_handling(argv[optind], fs);
} }
//---------------------------------------------------------------- //----------------------------------------------------------------