Fix regression in the discoverer's teardown logic

This commit is contained in:
Ole André Vadla Ravnås
2015-02-28 20:40:46 +01:00
parent eef56a495f
commit a185995ca2
+9 -9
View File
@@ -10,6 +10,14 @@ class Discoverer(object):
self._reactor = reactor
self._script = None
def dispose(self):
if self._script is not None:
try:
self._script.unload()
except:
pass
self._script = None
def start(self, process, ui):
def on_message(message, data):
self._reactor.schedule(lambda: self._process_message(message, data, process, ui))
@@ -25,14 +33,6 @@ class Discoverer(object):
'payload': {}
})
def stop(self):
if self._script is not None:
try:
self._script.unload()
except:
pass
self._script = None
def _create_discover_script(self):
return """\
function Sampler() {
@@ -170,7 +170,7 @@ def main():
def _stop(self):
print("Stopping...")
self._discoverer.stop()
self._discoverer.dispose()
self._discoverer = None
def on_sample_start(self, total):