From caf5cfb8b8dbac762655ab08b50bd42b50fadeb6 Mon Sep 17 00:00:00 2001
From: Arno Schoenmakers <schoenmakers@astron.nl>
Date: Tue, 27 Sep 2016 11:28:42 +0000
Subject: [PATCH] TAsk #6518: Adapt swlevel to use WCCILpmon for WinCC 3.14
---
MAC/APL/APLCommon/src/swlevel | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/MAC/APL/APLCommon/src/swlevel b/MAC/APL/APLCommon/src/swlevel
index 88209e2691a..a3652d17d28 100755
--- a/MAC/APL/APLCommon/src/swlevel
+++ b/MAC/APL/APLCommon/src/swlevel
@@ -237,14 +237,14 @@ start_prog()
fi
# Check if program is already running
- /sbin/pidof -x ${prog} 1>/dev/null 2>&1
+ /sbin/pidof -x ${prog} 1>/dev/null 2>&1
if [ $? -ne 0 ]; then
curdate=`date +%Y%m%dT%H%M%S`
# PVSS needs special treatment
- if [ "$prog" = "PVSS00pmon" ]; then
- echo Starting $prog
- start_pvss2 1>/dev/null 2>&1 &
- sleep 3
+ if [ "$prog" = "PVSS00pmon" -o "$prog" = "WCCILpmon" ]; then
+ echo Starting $prog
+ start_pvss2 1>/dev/null 2>&1 &
+ sleep 3
elif [ "$prog" = "SASGateway" ]; then
# Foreign stations not under central control should not
# connect to the SAS database; this prevents SAS main-
@@ -320,7 +320,7 @@ stop_prog()
fi
# PVSS needs special treatment
- if [ "$prog" = "PVSS00pmon" ]; then
+ if [ "$prog" = "PVSS00pmon" -o "$prog" = "WCCILpmon" ]; then
echo "Stopping PVSS database"
start_pvss2 -stopWait
return
@@ -434,13 +434,6 @@ status_prog()
highest_level_running=$levelnr
else
pid="DOWN"
- if [ "$prog" == "PVSS00pmon" ]; then
- # Check for WCCILpmon (3.14 equivalent)
- /sbin/pidof -x WCCILpmon 1>/dev/null 2>&1
- if [ $? -eq 0 ]; then
- pid=( `/sbin/pidof -x WCCILpmon` )
- fi
- fi
fi
if [ "$pid" != "DOWN" ] && [ ${#obsid[0]} != 0 ]; then
@@ -712,7 +705,7 @@ handle_args()
# On non-PVSS system LoggingProcessor.
logProgToSkip=LoggingProcessor
-if [ -f ${BINDIR}/PVSS00pmon ]; then
+if [ -f ${BINDIR}/PVSS00pmon -o -f ${BINDIR}/WCCILpmon ]; then
logProgToSkip=LoggingClient
fi
--
GitLab