Skip to content

Comments

cleanup mitmproxy.controller, raise Kill in Channel#1085

Merged
mhils merged 1 commit intomasterfrom
cleanup-controller
Apr 14, 2016
Merged

cleanup mitmproxy.controller, raise Kill in Channel#1085
mhils merged 1 commit intomasterfrom
cleanup-controller

Conversation

@mhils
Copy link
Member

@mhils mhils commented Apr 14, 2016

This PR refactors controller.Master into controller.Master and controller.ServerMaster and cleans up a couple of inconsistencies. Also, Channel now raises a Kill exception when the server shuts down, which fixes #907.

@Kriechi: How understandable is mitmproxy.controller now? My primary focus was to make this more readable, did I succeed at least a bit? (You'd need to look at the file probably, the diff is fairly broken)

@Kriechi
Copy link
Member

Kriechi commented Apr 14, 2016

LGTM
I guess this superseeds somehow #1057?

@mhils
Copy link
Member Author

mhils commented Apr 14, 2016

I think so, yes. #1057 is really hard to follow for me - we may want to keep at least the tests from there, #1084 is also somehow related. Whatsoever, I'm going to land this now.

@mhils mhils merged commit 423c076 into master Apr 14, 2016
@mhils mhils deleted the cleanup-controller branch April 14, 2016 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

On Shutdown: flow is None and crashes

2 participants