Script Refactoring

pull/2148/head
skiffer-git 2 years ago
parent a2485d6079
commit d0196b38a2

@ -43,12 +43,13 @@ for binary in "${!binaries[@]}"; do
fi fi
done done
for binary in "${!binaries[@]}"; do for binary in "${!binaries[@]}"; do
expected_count=${binaries[$binary]} expected_count=${binaries[$binary]}
base_path=$(get_bin_full_path "$binary") base_path=$(get_bin_full_path "$binary")
for ((i=0; i<expected_count; i++)); do for ((i=0; i<expected_count; i++)); do
full_path="${base_path} -i ${i} -c $OPENIM_OUTPUT_CONFIG" full_path="${base_path} -i ${i} -c $OPENIM_OUTPUT_CONFIG"
echo "full-path: " $full_path
check_binary_ports "$full_path" check_binary_ports "$full_path"
done done
done done

@ -398,6 +398,20 @@ openim::util::check_process_names() {
} }
openim::util::check_process_names_exist() {
local process_path="$1"
local running_count=$(ps -ef | grep "$process_path" | grep -v grep | wc -l)
if [ "$running_count" -gt 0 ]; then
echo 1
else
echo 0
fi
}
openim::util::check_process_names_for_stop() { openim::util::check_process_names_for_stop() {
@ -2888,6 +2902,23 @@ kill_binary() {
} }
kill_exist_binary() {
local binary_path="$1"
local pids=$(pgrep -f "$binary_path")
if [ -z "$pids" ]; then
echo 0
return
else
for pid in $pids; do
echo "Killing process $pid associated with $binary_path"
kill -9 "$pid"
done
echo 1
fi
}
if [[ "$*" =~ openim::util:: ]];then if [[ "$*" =~ openim::util:: ]];then

@ -27,7 +27,38 @@ start_binaries() {
done done
} }
kill_exist_binaries(){
for binary in "${!binaries[@]}"; do
full_path=$(get_bin_full_path "$binary")
result=$(openim::util::kill_exist_binary "$full_path")
if [ "$result" -eq 0 ]; then
echo "$binary no exist"
else
echo "$binary running. waiting stop"
fi
done
}
check_all_stop() {
for binary in "${!binaries[@]}"; do
expected_count=${binaries[$binary]}
full_path=$(get_bin_full_path "$binary")
result=$(openim::util::check_process_names_exist "$full_path")
if [ "$result" -ne 0 ]; then
echo "Process for $binary is still running. Aborting..."
exit 1
fi
done
echo "All processes have been stopped."
}
kill_exist_binaries
check_all_stop
# Call the main function # Call the main function
start_binaries start_binaries

Loading…
Cancel
Save