|
169 |
fi |
169 |
fi |
170 |
} |
170 |
} |
171 |
|
171 |
|
|
|
172 |
apache_wait_for_pidfile() { |
173 |
# wait up to 5 seconds until really started (i.e., PIDFILE exists) |
174 |
i=0 |
175 |
while [ "$i" -lt "50" ]; do |
176 |
if [ -e "$PIDFILE" ]; then |
177 |
return 0 |
178 |
fi |
179 |
i=$(($i+1)) |
180 |
sleep 0.1 |
181 |
done |
182 |
return 1 |
183 |
} |
184 |
|
172 |
close_fds () { |
185 |
close_fds () { |
173 |
local fd |
186 |
local fd |
174 |
for fd in /proc/self/fd/* |
187 |
for fd in /proc/self/fd/* |
|
195 |
log_progress_msg htcacheclean |
208 |
log_progress_msg htcacheclean |
196 |
start_htcacheclean || log_end_msg 1 |
209 |
start_htcacheclean || log_end_msg 1 |
197 |
fi |
210 |
fi |
198 |
log_end_msg 0 |
211 |
if ! apache_wait_for_pidfile ; then |
|
|
212 |
log_end_msg 0 |
213 |
log_warning_msg "apache2 is running, but pidfile is not yet created" |
214 |
else |
215 |
log_end_msg 0 |
216 |
fi |
199 |
else |
217 |
else |
200 |
log_end_msg 1 |
218 |
log_end_msg 1 |
201 |
fi |
219 |
fi |
|
286 |
if check_htcacheclean ; then |
304 |
if check_htcacheclean ; then |
287 |
start_htcacheclean || log_end_msg 1 |
305 |
start_htcacheclean || log_end_msg 1 |
288 |
fi |
306 |
fi |
289 |
log_end_msg 0 |
307 |
if ! apache_wait_for_pidfile ; then |
|
|
308 |
log_end_msg 0 |
309 |
log_warning_msg "apache2 is running, but pidfile is not yet created" |
310 |
else |
311 |
log_end_msg 0 |
312 |
fi |
290 |
else |
313 |
else |
291 |
log_end_msg 1 |
314 |
log_end_msg 1 |
292 |
fi |
315 |
fi |