equal
deleted
inserted
replaced
64 if self.callback: |
64 if self.callback: |
65 self.callback(outchunk) |
65 self.callback(outchunk) |
66 if self.endcallback: |
66 if self.endcallback: |
67 try: |
67 try: |
68 err = self.Proc.wait() |
68 err = self.Proc.wait() |
69 except: |
69 except Exception: |
70 err = self.retval |
70 err = self.retval |
71 self.finished = True |
71 self.finished = True |
72 self.endcallback(self.Proc.pid, err) |
72 self.endcallback(self.Proc.pid, err) |
73 |
73 |
74 |
74 |
203 sig = SIGTERM |
203 sig = SIGTERM |
204 else: |
204 else: |
205 sig = SIGKILL |
205 sig = SIGKILL |
206 try: |
206 try: |
207 os.kill(self.Proc.pid, sig) |
207 os.kill(self.Proc.pid, sig) |
208 except: |
208 except Exception: |
209 pass |
209 pass |
210 self.outt.join() |
210 self.outt.join() |
211 self.errt.join() |
211 self.errt.join() |
212 |
212 |
213 def endlog(self): |
213 def endlog(self): |