Skip to content

Commit 625b732

Browse files
Martin-RehrMartin-Rehr
committed
Manulally merge PR221 to Fix migrid init sftpsubsys status
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6218 b75ad72c-e7d7-11dd-a971-7dbc132099af
1 parent 09105fd commit 625b732

File tree

4 files changed

+114
-64
lines changed

4 files changed

+114
-64
lines changed

‎mig/install/migrid-init.d-deb-template

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -836,14 +836,22 @@ status_vmproxy() {
836836
status_sftpsubsys_workers() {
837837
DAEMON_PATH=${MIG_SFTPSUBSYS_WORKER}
838838
SHORT_NAME=$(basename ${DAEMON_PATH})
839-
pgrep -f ${DAEMON_PATH} > /dev/null
839+
PIDS=$(pgrep -f ${DAEMON_PATH}) || true
840+
[ -n "$PIDS" ] && echo "$SHORT_NAME: (pids: $PIDS) is running..."
840841
}
841842
status_sftpsubsys() {
842843
check_enabled "sftp_subsys" || return 0
844+
status_sftpsubsys_workers
843845
DAEMON_PATH=${MIG_SFTPSUBSYS}
844846
SHORT_NAME=$(basename ${DAEMON_PATH})
845-
pgrep -f "${DAEMON_PATH} -f ${MIG_SFTPSUBSYS_CONF}" > /dev/null
846-
status_sftpsubsys_workers
847+
COMMAND_PATH="${DAEMON_PATH} -f ${MIG_SFTPSUBSYS_CONF}"
848+
PID=$(pgrep -f "${COMMAND_PATH}")
849+
if [ -n "$PID" ]; then
850+
echo "${COMMAND_PATH}: (pid: $PID) is running..."
851+
return 0
852+
else
853+
echo "${COMMAND_PATH} is stopped"
854+
return 3
847855
}
848856

849857
status_all() {

‎mig/install/migrid-init.d-rh-template

Lines changed: 46 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ start_monitor() {
163163
"${DAEMON_PATH} >> ${MIG_LOG}/monitor.out 2>&1 &"
164164
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
165165
RET2=$?
166-
[ $RET2 ] && success
166+
[ $RET2 -eq 0 ] && success
167167
echo
168-
[ $RET2 ] || echo "Warning: monitor not started."
168+
[ $RET2 -ne 0 ] && echo "Warning: monitor not started."
169169
echo
170170
}
171171
start_sshmux() {
@@ -178,9 +178,9 @@ start_sshmux() {
178178
"${DAEMON_PATH} >> ${MIG_LOG}/sshmux.out 2>&1 &"
179179
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
180180
RET2=$?
181-
[ $RET2 ] && success
181+
[ $RET2 -eq 0 ] && success
182182
echo
183-
[ $RET2 ] || echo "Warning: sshmux not started."
183+
[ $RET2 -ne 0 ] && echo "Warning: sshmux not started."
184184
echo
185185
}
186186
start_events() {
@@ -194,9 +194,9 @@ start_events() {
194194
"${DAEMON_PATH} >> ${MIG_LOG}/events.out 2>&1 &"
195195
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
196196
RET2=$?
197-
[ $RET2 ] && success
197+
[ $RET2 -eq 0 ] && success
198198
echo
199-
[ $RET2 ] || echo "Warning: events not started."
199+
[ $RET2 -ne 0 ] && echo "Warning: events not started."
200200
echo
201201
}
202202
start_cron() {
@@ -210,9 +210,9 @@ start_cron() {
210210
"${DAEMON_PATH} >> ${MIG_LOG}/cron.out 2>&1 &"
211211
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
212212
RET2=$?
213-
[ $RET2 ] && success
213+
[ $RET2 -eq 0 ] && success
214214
echo
215-
[ $RET2 ] || echo "Warning: cron not started."
215+
[ $RET2 -ne 0 ] && echo "Warning: cron not started."
216216
echo
217217
}
218218
start_transfers() {
@@ -225,9 +225,9 @@ start_transfers() {
225225
"${DAEMON_PATH} >> ${MIG_LOG}/transfers.out 2>&1 &"
226226
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
227227
RET2=$?
228-
[ $RET2 ] && success
228+
[ $RET2 -eq 0 ] && success
229229
echo
230-
[ $RET2 ] || echo "Warning: transfers not started."
230+
[ $RET2 -ne 0 ] && echo "Warning: transfers not started."
231231
echo
232232
}
233233
start_openid() {
@@ -240,9 +240,9 @@ start_openid() {
240240
"${DAEMON_PATH} >> ${MIG_LOG}/openid.out 2>&1 &"
241241
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
242242
RET2=$?
243-
[ $RET2 ] && success
243+
[ $RET2 -eq 0 ] && success
244244
echo
245-
[ $RET2 ] || echo "Warning: openid not started."
245+
[ $RET2 -ne 0 ] && echo "Warning: openid not started."
246246
echo
247247
}
248248
start_sftp() {
@@ -255,9 +255,9 @@ start_sftp() {
255255
"${DAEMON_PATH} >> ${MIG_LOG}/sftp.out 2>&1 &"
256256
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
257257
RET2=$?
258-
[ $RET2 ] && success
258+
[ $RET2 -eq 0 ] && success
259259
echo
260-
[ $RET2 ] || echo "Warning: sftp not started."
260+
[ $RET2 -ne 0 ] && echo "Warning: sftp not started."
261261
echo
262262
}
263263
start_webdavs() {
@@ -270,9 +270,9 @@ start_webdavs() {
270270
"${DAEMON_PATH} >> ${MIG_LOG}/webdavs.out 2>&1 &"
271271
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
272272
RET2=$?
273-
[ $RET2 ] && success
273+
[ $RET2 -eq 0 ] && success
274274
echo
275-
[ $RET2 ] || echo "Warning: webdavs not started."
275+
[ $RET2 -ne 0 ] && echo "Warning: webdavs not started."
276276
echo
277277
}
278278
start_ftps() {
@@ -285,9 +285,9 @@ start_ftps() {
285285
"${DAEMON_PATH} >> ${MIG_LOG}/ftps.out 2>&1 &"
286286
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
287287
RET2=$?
288-
[ $RET2 ] && success
288+
[ $RET2 -eq 0 ] && success
289289
echo
290-
[ $RET2 ] || echo "Warning: ftps not started."
290+
[ $RET2 -ne 0 ] && echo "Warning: ftps not started."
291291
echo
292292
}
293293
start_notify() {
@@ -300,9 +300,9 @@ start_notify() {
300300
"${DAEMON_PATH} >> ${MIG_LOG}/notify.out 2>&1 &"
301301
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
302302
RET2=$?
303-
[ $RET2 ] && success
303+
[ $RET2 -eq 0 ] && success
304304
echo
305-
[ $RET2 ] || echo "Warning: notify not started."
305+
[ $RET2 -ne 0 ] && echo "Warning: notify not started."
306306
echo
307307
}
308308
start_imnotify() {
@@ -315,9 +315,9 @@ start_imnotify() {
315315
"${DAEMON_PATH} >> ${MIG_LOG}/imnotify.out 2>&1 &"
316316
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
317317
RET2=$?
318-
[ $RET2 ] && success
318+
[ $RET2 -eq 0 ] && success
319319
echo
320-
[ $RET2 ] || echo "Warning: imnotify not started."
320+
[ $RET2 -ne 0 ] && echo "Warning: imnotify not started."
321321
echo
322322
}
323323
start_vmproxy() {
@@ -330,9 +330,9 @@ start_vmproxy() {
330330
"${DAEMON_PATH} >> ${MIG_LOG}/vmproxy.out 2>&1 &"
331331
fallback_save_pid "$DAEMON_PATH" "$PID_FILE" "$!"
332332
RET2=$?
333-
[ $RET2 ] && success
333+
[ $RET2 -eq 0 ] && success
334334
echo
335-
[ $RET2 ] || echo "Warning: vmproxy not started."
335+
[ $RET2 -ne 0 ] && echo "Warning: vmproxy not started."
336336
echo
337337
}
338338
start_sftpsubsys() {
@@ -342,9 +342,9 @@ start_sftpsubsys() {
342342
echo -n "Starting MiG sftpsubsys daemon: $SHORT_NAME"
343343
${DAEMON_PATH} -f ${MIG_SFTPSUBSYS_CONF}
344344
RET2=$?
345-
[ $RET2 ] && success
345+
[ $RET2 -eq 0 ] && success
346346
echo
347-
[ $RET2 ] || echo "Warning: sftpsubsys not started."
347+
[ $RET2 -ne 0 ] && echo "Warning: sftpsubsys not started."
348348
echo
349349
# NOTE: sftp subsys workers start automatically
350350
}
@@ -516,6 +516,7 @@ stop_sftpsubsys_workers() {
516516
echo -n "Shutting down MiG sftpsubsys workers: $SHORT_NAME "
517517
# Proc only running if one or more clients are connected
518518
pkill -f ${DAEMON_PATH} || true
519+
success
519520
echo
520521
}
521522
stop_sftpsubsys() {
@@ -524,6 +525,9 @@ stop_sftpsubsys() {
524525
SHORT_NAME=$(basename ${DAEMON_PATH})
525526
echo -n "Shutting down MiG sftpsubsys: $SHORT_NAME "
526527
pkill -f "${DAEMON_PATH} -f ${MIG_SFTPSUBSYS_CONF}"
528+
RET2=$?
529+
[ $RET2 -eq 0 ] && success
530+
[ $RET2 -ne 0 ] && failure
527531
echo
528532
# Workers don't react to parent stop and hang on to mount point etc.
529533
sleep 1
@@ -674,6 +678,7 @@ reload_sftpsubsys_workers() {
674678
echo -n "Reloading MiG sftpsubsys workers: $SHORT_NAME "
675679
# Proc only running if one or more clients are connected
676680
pkill -HUP -f ${DAEMON_PATH} || true
681+
success
677682
echo
678683
}
679684
reload_sftpsubsys() {
@@ -682,6 +687,9 @@ reload_sftpsubsys() {
682687
SHORT_NAME=$(basename ${DAEMON_PATH})
683688
echo -n "Reloading MiG sftpsubsys: $SHORT_NAME "
684689
pkill -HUP -f "${DAEMON_PATH} -f ${MIG_SFTPSUBSYS_CONF}"
690+
RET2=$?
691+
[ $RET2 -eq 0 ] && success
692+
[ $RET2 -ne 0 ] && failure
685693
echo
686694
# Workers don't react to parent reload and hang on to mount point etc.
687695
sleep 1
@@ -819,14 +827,23 @@ status_vmproxy() {
819827
status_sftpsubsys_workers() {
820828
DAEMON_PATH=${MIG_SFTPSUBSYS_WORKER}
821829
SHORT_NAME=$(basename ${DAEMON_PATH})
822-
pgrep -f ${DAEMON_PATH} > /dev/null
830+
PIDS=$(pgrep -f ${DAEMON_PATH}) || true
831+
[ -n "$PIDS" ] && echo "$SHORT_NAME: (pids: $PIDS) is running..."
823832
}
824833
status_sftpsubsys() {
825834
check_enabled "sftp_subsys" || return
835+
status_sftpsubsys_workers
826836
DAEMON_PATH=${MIG_SFTPSUBSYS}
827837
SHORT_NAME=$(basename ${DAEMON_PATH})
828-
pgrep -f "${DAEMON_PATH} -f ${MIG_SFTPSUBSYS_CONF}" > /dev/null
829-
status_sftpsubsys_workers
838+
COMMAND_PATH="${DAEMON_PATH} -f ${MIG_SFTPSUBSYS_CONF}"
839+
PID=$(pgrep -f "${COMMAND_PATH}")
840+
if [ -n "$PID" ]; then
841+
echo "${COMMAND_PATH}: (pid: $PID) is running..."
842+
return 0
843+
else
844+
echo "${COMMAND_PATH} is stopped"
845+
return 3
846+
fi
830847
}
831848

832849
status_all() {

‎tests/fixture/confs-stdlocal/migrid-init.d-deb

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -836,14 +836,22 @@ status_vmproxy() {
836836
status_sftpsubsys_workers() {
837837
DAEMON_PATH=${MIG_SFTPSUBSYS_WORKER}
838838
SHORT_NAME=$(basename ${DAEMON_PATH})
839-
pgrep -f ${DAEMON_PATH} > /dev/null
839+
PIDS=$(pgrep -f ${DAEMON_PATH}) || true
840+
[ -n "$PIDS" ] && echo "$SHORT_NAME: (pids: $PIDS) is running..."
840841
}
841842
status_sftpsubsys() {
842843
check_enabled "sftp_subsys" || return 0
844+
status_sftpsubsys_workers
843845
DAEMON_PATH=${MIG_SFTPSUBSYS}
844846
SHORT_NAME=$(basename ${DAEMON_PATH})
845-
pgrep -f "${DAEMON_PATH} -f ${MIG_SFTPSUBSYS_CONF}" > /dev/null
846-
status_sftpsubsys_workers
847+
COMMAND_PATH="${DAEMON_PATH} -f ${MIG_SFTPSUBSYS_CONF}"
848+
PID=$(pgrep -f "${COMMAND_PATH}")
849+
if [ -n "$PID" ]; then
850+
echo "${COMMAND_PATH}: (pid: $PID) is running..."
851+
return 0
852+
else
853+
echo "${COMMAND_PATH} is stopped"
854+
return 3
847855
}
848856

849857
status_all() {

0 commit comments

Comments
 (0)