aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/testbed.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/testbed.py b/scripts/testbed.py
index b0e6535b..e74eda5f 100644
--- a/scripts/testbed.py
+++ b/scripts/testbed.py
@@ -259,9 +259,9 @@ def main():
try:
for a in db.engines:
a.kill_daemons()
- for p in (rootd_process, rsyncd_process):
+ for p,n in ((rootd_process, "rootd"), (rsyncd_process, "rsyncd")):
if p is not None:
- rpki.log.info("Killing process %d" % p.pid)
+ rpki.log.info("Killing %n[%d]" % (n, p.pid))
os.kill(p.pid, signal.SIGTERM)
except Exception, data:
rpki.log.warn("Couldn't clean up daemons (%s), continuing" % data)
py?h=zone-cleanup&id=35c1ca65ac2b5cbd943248d59b3e02c6220b232f'>35c1ca65
b603ea6e


35c1ca65
b603ea6e







a780a780
b603ea6e



eba8fc67











bc00240b


a780a780
bc00240b


2d5c5397

bc00240b
b1e9a923
35c1ca65
03d0e7da
bc00240b


13a65b46
252393a3

03d0e7da
bc00240b
4d0e0f0c

03d0e7da
275ec868
bc00240b


13a65b46
bc00240b
275ec868
4d0e0f0c

bc00240b


13a65b46
bc00240b
4d0e0f0c
03d0e7da
bc00240b


13a65b46
bc00240b
eba8fc67
bc00240b





2d5c5397
03d0e7da
b1e9a923
bc00240b




13a65b46
bc00240b










13a65b46
bc00240b






13a65b46
bc00240b






13a65b46
bc00240b
309dbf08




13a65b46
309dbf08


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146