From 3f6521f9125b13f61192fefde94d9b6d0fc6e489 Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Wed, 11 Nov 2015 09:03:05 +0800 Subject: Use watchdog to reload scripts automatically. --- libmproxy/console/__init__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'libmproxy/console') diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 3bc0c091..7ef1185c 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -225,6 +225,7 @@ class ConsoleMaster(flow.FlowMaster): if err: print >> sys.stderr, "Script load error:", err sys.exit(1) + script.ObserveScripts(self, i) if options.outfile: err = self.start_stream_to_path( -- cgit v1.2.3 From 2522ba69fa5a8acb394c48cba05afdb5e01b4e4a Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Wed, 11 Nov 2015 20:59:12 +0800 Subject: Move the observer initalization to the constructor of Script class.Should work with both mitmproxy and mitmdump now. Change the names in PEP8 style. --- libmproxy/console/__init__.py | 1 - 1 file changed, 1 deletion(-) (limited to 'libmproxy/console') diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 7ef1185c..3bc0c091 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -225,7 +225,6 @@ class ConsoleMaster(flow.FlowMaster): if err: print >> sys.stderr, "Script load error:", err sys.exit(1) - script.ObserveScripts(self, i) if options.outfile: err = self.start_stream_to_path( -- cgit v1.2.3 From cd0b9e01be4041275165ab5e90b524ab0b3247f0 Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Fri, 13 Nov 2015 21:08:39 +0800 Subject: Decouple libmproxy.script from libmproxy.flow --- libmproxy/console/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libmproxy/console') diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 3bc0c091..e1b38c45 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -731,3 +731,7 @@ class ConsoleMaster(flow.FlowMaster): if f: self.process_flow(f) return f + + def script_change(self, script): + self.masterq.put(("script_change", script)) + signals.status_message.send(message="<{}> reloaded.".format(script.args[0])) -- cgit v1.2.3