equal
deleted
inserted
replaced
29 import os |
29 import os |
30 import sys |
30 import sys |
31 import getopt |
31 import getopt |
32 import threading |
32 import threading |
33 import shlex |
33 import shlex |
|
34 import traceback |
34 from threading import Thread, Semaphore, Lock, currentThread |
35 from threading import Thread, Semaphore, Lock, currentThread |
35 from builtins import str as text |
36 from builtins import str as text |
36 from past.builtins import execfile |
37 from past.builtins import execfile |
37 from six.moves import builtins |
38 from six.moves import builtins |
38 |
39 |
612 |
613 |
613 pyroserver.Quit() |
614 pyroserver.Quit() |
614 pyro_thread.join() |
615 pyro_thread.join() |
615 |
616 |
616 plcobj = runtime.GetPLCObjectSingleton() |
617 plcobj = runtime.GetPLCObjectSingleton() |
617 plcobj.StopPLC() |
618 try: |
618 plcobj.UnLoadPLC() |
619 plcobj.StopPLC() |
|
620 plcobj.UnLoadPLC() |
|
621 except: |
|
622 print(traceback.format_exc()) |
619 |
623 |
620 if havetwisted: |
624 if havetwisted: |
621 reactor.stop() |
625 reactor.stop() |
622 ui_thread.join() |
626 ui_thread.join() |
623 elif havewx: |
627 elif havewx: |