Skip to content

Commit f66ce52

Browse files
fix: replace quit() with sys.exit(1) for reliable process termination (#375)
1 parent 8582910 commit f66ce52

6 files changed

Lines changed: 14 additions & 8 deletions

File tree

0mq/funbody.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import concore
22
import time
3+
import sys
34
from osparc_control import CommandManifest
45
from osparc_control import CommandParameter
56
from osparc_control import CommandType
@@ -58,7 +59,7 @@
5859
request_id=command.request_id, payload=ym)
5960
else:
6061
print("undefined action"+str(command.action))
61-
quit()
62+
sys.exit(1)
6263
#concore.write(concore.oport['Y1'],"ym",ym)
6364
print("funbody u="+str(u)+" ym="+str(ym)+" time="+str(concore.simtime))
6465
paired_transmitter.stop_background_sync()

demo/cwrap.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import time
55
from ast import literal_eval
66
import os
7+
import sys
78

89
#time.sleep(7)
910
timeout_max = 20
@@ -86,7 +87,7 @@
8687
r = requests.post('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
8788
if r.status_code!=200:
8889
print("bad POST request "+str(r.status_code))
89-
quit()
90+
sys.exit(1)
9091
if len(r.text)!=0:
9192
try:
9293
t=literal_eval(r.text)[0]
@@ -107,7 +108,7 @@
107108
timeout_count += 1
108109
if r.status_code!=200 or time.perf_counter()-t1 > 1.1*timeout_max: #timeout_count>100:
109110
print("timeout or bad POST request "+str(r.status_code))
110-
quit()
111+
sys.exit(1)
111112
if len(r.text)!=0:
112113
try:
113114
t=literal_eval(r.text)[0]

demo/pwrap.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import time
55
from ast import literal_eval
66
import os
7+
import sys
78

89
#time.sleep(7)
910
timeout_max=20
@@ -93,7 +94,7 @@
9394
r = requests.post('http://www.controlcore.org/ctl/'+yuyu+apikey+'&fetch='+name1, files=f,timeout=timeout_max)
9495
if r.status_code!=200:
9596
print("bad POST request "+str(r.status_code))
96-
quit()
97+
sys.exit(1)
9798
if len(r.text)!=0:
9899
try:
99100
t=literal_eval(r.text)[0]
@@ -114,7 +115,7 @@
114115
timeout_count += 1
115116
if r.status_code!=200 or time.perf_counter()-t1 > 1.1*timeout_max: #timeout_count>200:
116117
print("timeout or bad POST request "+str(r.status_code))
117-
quit()
118+
sys.exit(1)
118119
if len(r.text)!=0:
119120
try:
120121
t=literal_eval(r.text)[0]

tools/pidmayuresh1.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import numpy as np
22
import math
33
import concore
4+
import sys
45
dT = 0.1
56
global Prev_Error, I, freq
67
Prev_Error = 0
@@ -22,7 +23,7 @@ def pid_controller(ym):
2223
Error = sp - ym[0]
2324
else:
2425
print('invalid control input '+cin)
25-
quit()
26+
sys.exit(1)
2627
P = Error
2728
I = I + Error*dT
2829
D = (Error - Prev_Error )/dT

tools/pidmayuresh3.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import numpy as np
22
import math
33
import concore
4+
import sys
45
dT = 0.1
56

67
sp = concore.tryparam('sp', 67.5)
@@ -20,7 +21,7 @@ def pid_controller(state, ym, sp, Kp, Ki, Kd, sigout, cin, low, up):
2021
Error = sp - ym[0]
2122
else:
2223
print('invalid control input '+cin)
23-
quit()
24+
sys.exit(1)
2425
P = Error
2526
I = I + Error*dT
2627
D = (Error - Prev_Error )/dT

tools/pidsig.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import math
33
import concore
44
import logging
5+
import sys
56
dT = 0.1
67
global Prev_Error, I, freq
78
Prev_Error = 0
@@ -23,7 +24,7 @@ def pid_controller(ym):
2324
Error = sp - ym[0]
2425
else:
2526
logging.error(f'invalid control input {cin}')
26-
quit()
27+
sys.exit(1)
2728
P = Error
2829
I = I + Error*dT
2930
D = (Error - Prev_Error )/dT

0 commit comments

Comments
 (0)