@@ -421,7 +421,6 @@ status(){
421
421
echo " Agent is not installed."
422
422
exit 1
423
423
fi
424
- agentVersion=$( grep agentVersion " $CONFDIR " /config.json | awk ' { print $2 }' | sed ' s/,//g' )
425
424
info
426
425
if [ " $containerRuntime " = " docker" ]
427
426
then
@@ -691,13 +690,34 @@ start()
691
690
fi
692
691
runAgent
693
692
echo " "
694
- agentVersion=$( grep agentVersion " $CONFDIR " /config.json | awk ' { print $2 }' | sed ' s/,//g' )
695
693
info
696
694
echo " "
697
695
echo " INFO: Logs directory: ${PV} /data/logs"
698
696
echo " INFO: You can monitor the agent ${AI} from the Access Governance Console."
699
697
}
700
698
699
+ forceStopPodman ()
700
+ {
701
+ # Get the main process for the container.
702
+ CONTAINER_ID=$( podman ps | grep " $AI " | awk ' {print $1}' )
703
+ if [ -n " ${CONTAINER_ID} " ]; then
704
+ echo Container ID : " $CONTAINER_ID "
705
+ CONTAINER_PROCESS_ID=$( ps -ef | grep -v grep | grep " $CONTAINER_ID " | awk ' {print $2}' )
706
+ echo Container Process ID: ${CONTAINER_PROCESS_ID}
707
+
708
+ # Kill any processes containing the process ID.
709
+ # This kills the child processes too.
710
+ # shellcheck disable=SC2046
711
+ kill -9 ` ps -ef | grep -v grep | grep ${CONTAINER_PROCESS_ID} | awk ' {print $2}' `
712
+
713
+ # Stop the container, as Podman doesn't notice the processes are dead until you interact with the container.
714
+ echo " Stop container. Ignore errors."
715
+ podman stop " $AI "
716
+ else
717
+ echo " Container Already Stopped"
718
+ fi
719
+ }
720
+
701
721
# shellcheck source=/dev/null
702
722
stop ()
703
723
{
@@ -723,6 +743,7 @@ stop()
723
743
echo " INFO: Waiting for running operations to complete. It may take some time"
724
744
podman exec " $AI " /bin/bash -c ' agent --config /app/data/conf/config.json ido lcm -i status_check; while [[ "$?" != "2" && "$?" != "255" ]]; do sleep 5s;agent --config /app/data/conf/config.json ido lcm -i status_check; done' > /dev/null
725
745
podman stop " $AI "
746
+ forceStopPodman
726
747
fi
727
748
echo " INFO: Agent Stopped"
728
749
}
@@ -1104,4 +1125,4 @@ while [ $# -gt 0 ]; do
1104
1125
* ) echo " ERROR: agentManagement: Invalid option: \" $opt \" " >&2
1105
1126
exit 1;;
1106
1127
esac
1107
- done
1128
+ done
0 commit comments