lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

logging: Don't throw from Activity destructor

Browse source 
Move definition of destructor to logging.cc for
access to util.hh's ignoreException.
This commit is contained in:
Will Dietz 2018-03-03 14:39:04 -06:00
parent 70dbac7491
commit e917c05628
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libutil/logging.cc
View file

@ -221,4 +221,12 @@ bool handleJSONLogMessage(const std::string & msg,
return true; return true;
} }
Activity::~Activity() {
try {
logger.stopActivity(id);
} catch (...) {
ignoreException();
}
}
} }

3
src/libutil/logging.hh
View file

@ -94,8 +94,7 @@ struct Activity
Activity(const Activity & act) = delete; Activity(const Activity & act) = delete;
~Activity() ~Activity();
{ logger.stopActivity(id); }
void progress(uint64_t done = 0, uint64_t expected = 0, uint64_t running = 0, uint64_t failed = 0) const void progress(uint64_t done = 0, uint64_t expected = 0, uint64_t running = 0, uint64_t failed = 0) const
{ result(resProgress, done, expected, running, failed); } { result(resProgress, done, expected, running, failed); }