fixed delay issue. todo: full blown testing and merge

savon-noir · savon-noir · commit a232762583d6 · 2014-05-13T18:59:44.000+02:00
diff --git a/examples/nmap_task.py b/examples/nmap_task.py
@@ -3,17 +3,17 @@
 from libnmap.process import NmapProcess
 from time import sleep
 
-
-nmap_proc = NmapProcess(targets="scanme.nmap.org", options="-sV")
-nmap_proc.run_background()
-while nmap_proc.is_alive():
+def mycallback(nmaptask):
     nmaptask = nmap_proc.current_task
     if nmaptask:
         print "Task {0} ({1}): ETC: {2} DONE: {3}%".format(nmaptask.name,
                                                            nmaptask.status,
                                                            nmaptask.etc,
                                                            nmaptask.progress)
-    sleep(2)
 
-print "rc: {0} output: {1}".format(nmap_proc.rc, nmap_proc.summary)
+nmap_proc = NmapProcess(targets="scanme.nmap.org",
+                        options="-sV",
+                        event_callback=mycallback)
+nmap_proc.run()
 print nmap_proc.stdout
+print nmap_proc.stderr
diff --git a/libnmap/process.py b/libnmap/process.py
@@ -282,7 +282,7 @@ def ioreader_routine(proc_stdout, io_queue, data_pushed, producing):
         while(self.__nmap_proc.poll() is None or producing.value == 1):
             if self.__process_killed.is_set():
                 break
-            if producing.value == 1:
+            if producing.value == 1 and qout.empty():
                 try:
                     data_pushed.wait()
                 except KeyboardInterrupt:
