equal
deleted
inserted
replaced
552 return |
552 return |
553 import signal |
553 import signal |
554 pid = int(open(pidf).read().strip()) |
554 pid = int(open(pidf).read().strip()) |
555 try: |
555 try: |
556 kill(pid, signal.SIGTERM) |
556 kill(pid, signal.SIGTERM) |
557 except: |
557 except Exception: |
558 print >> sys.stderr, "process %s seems already dead." % pid |
558 print >> sys.stderr, "process %s seems already dead." % pid |
559 else: |
559 else: |
560 try: |
560 try: |
561 wait_process_end(pid) |
561 wait_process_end(pid) |
562 except ExecutionError, ex: |
562 except ExecutionError, ex: |
563 print >> sys.stderr, ex |
563 print >> sys.stderr, ex |
564 print >> sys.stderr, 'trying SIGKILL' |
564 print >> sys.stderr, 'trying SIGKILL' |
565 try: |
565 try: |
566 kill(pid, signal.SIGKILL) |
566 kill(pid, signal.SIGKILL) |
567 except: |
567 except Exception: |
568 # probably dead now |
568 # probably dead now |
569 pass |
569 pass |
570 wait_process_end(pid) |
570 wait_process_end(pid) |
571 try: |
571 try: |
572 remove(pidf) |
572 remove(pidf) |