Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't throw in destructor, happens in nix-daemon when client disappears. #1944

Merged
merged 1 commit into from Mar 6, 2018
Merged

Don't throw in destructor, happens in nix-daemon when client disappears. #1944

merged 1 commit into from Mar 6, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 4, 2018

Wasn't sure how to best handle the ignoreException decl re:layering.

shlevy
shlevy suggested changes Mar 4, 2018
View reviewed changes
Copy link
Member

@shlevy shlevy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you just make an exceptions.hh or whatever to hold this declaration (and possibly other related definitions that can move there)?

@dtzWill
logging: Don't throw from Activity destructor
e917c05 
Move definition of destructor to logging.cc for
access to util.hh's ignoreException.
@dtzWill dtzWill force-pushed the fix/activity-destructor-exception branch from 26af1d1 to e917c05 Compare March 6, 2018 16:44
@dtzWill
Copy link
Member Author

dtzWill commented Mar 6, 2018

Moved into logging.cc instead, minimal org impact :).

@shlevy shlevy merged commit e917c05 into NixOS:master Mar 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shlevy shlevy shlevy requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dtzWill @shlevy