-
Notifications
You must be signed in to change notification settings - Fork 258
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.
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
Fix #1025 - Stop using Thread._stop incorrectly when stopping ThreadedArbiter. #1052
Conversation
…so restrict tornado to v<5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Your PR looks good, but our CI seems to still be broken :( . I have to find some time to fix it.
53e4851
to
47925ed
Compare
So I spent a bit of time getting the tests to pass. There is still a weird |
e072bc0
to
a6ae42d
Compare
OK I did some more tweaks to the CI setup and on my repo the py34/py35 tests worked (https://travis-ci.org/commodityvectors/circus/builds/339206732) but have failed here for a reason I thought was resolved by the |
It looks like Circus is broken for anyone using |
The main commit was cherry-picked in 29b0bf3. Thank you for your work and sorry for the awful delay! |
Also restrict tornado to v<5 (this is done because in v5 the initializer arguments have changed for some of the classes).
I tried using http://issue2pr.herokuapp.com/ to facilitate this PR but it didn't work for me.
It's arguable to either use the dunder syntax or just rearrange the inheritance order of ThreadedArbiter. I went with the former because I prefer it, so I can change what I've done if it's preferable to do the latter :)