equal
deleted
inserted
replaced
533 pyroserver = Server(servicename, given_ip, port, |
533 pyroserver = Server(servicename, given_ip, port, |
534 WorkingDir, argv, autostart, |
534 WorkingDir, argv, autostart, |
535 statuschange, pyruntimevars=pyruntimevars) |
535 statuschange, pyruntimevars=pyruntimevars) |
536 |
536 |
537 |
537 |
538 # Exception hooks s |
538 # Exception hooks |
539 |
|
540 |
539 |
541 |
540 |
542 def LogMessageAndException(msg, exp=None): |
541 def LogMessageAndException(msg, exp=None): |
543 if exp is None: |
542 if exp is None: |
544 exp = sys.exc_info() |
543 exp = sys.exc_info() |
546 pyroserver.plcobj.LogMessage(0, msg + '\n'.join(traceback.format_exception(*exp))) |
545 pyroserver.plcobj.LogMessage(0, msg + '\n'.join(traceback.format_exception(*exp))) |
547 else: |
546 else: |
548 print(msg) |
547 print(msg) |
549 traceback.print_exception(*exp) |
548 traceback.print_exception(*exp) |
550 |
549 |
|
550 |
551 def LogException(*exp): |
551 def LogException(*exp): |
552 LogExceptionAndMessage("",exp) |
552 LogExceptionAndMessage("", exp) |
553 |
553 |
554 sys.excepthook = LogException |
554 sys.excepthook = LogException |
555 |
555 |
556 |
556 |
557 def installThreadExcepthook(): |
557 def installThreadExcepthook(): |