CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

some debugging

Browse Source
This commit is contained in:
m0duspwnens
2020-08-13 16:34:18 -04:00
parent 1b4029f74b
commit 3d20cc0341
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
setup/so-functions
View File

@@ -1386,6 +1386,7 @@ check_service_status() {
} }
check_salt_master_status() { check_salt_master_status() {
echo "Checking salt-master status" >> "$setup_log" 2>&1
salt-call state.show_top >> "$setup_log" 2>&1 salt-call state.show_top >> "$setup_log" 2>&1
local exit_code=$? local exit_code=$?
if [ $exit_code -gt 0 ]; then if [ $exit_code -gt 0 ]; then
@@ -1394,6 +1395,7 @@ check_salt_master_status() {
exit_code=0 exit_code=0
fi fi
echo "$exit_code" >> "$setup_log" 2>&1
return $exit_code return $exit_code
} }
@@ -1413,26 +1415,26 @@ salt_checkin() {
) )
local LOOP_COUNT=0 local LOOP_COUNT=0
for service in "${SALT_SERVICES[@]}"; do for service in "${SALT_SERVICES[@]}"; do
systemctl stop "$service"; systemctl stop "$service" >> "$setup_log" 2>&1
LOOP_COUNT=0 LOOP_COUNT=0
while check_service_status "$service"; do while check_service_status "$service"; do
echo "$service still running" >> "$setup_log" 2>&1 echo "$service still running" >> "$setup_log" 2>&1
if [ $LOOP_COUNT -gt 120 ]; then if [ $LOOP_COUNT -gt 120 ]; then
echo "$service could not be stopped in 120 seconds" >> "$setup_log" 2>&1 echo "$service could not be stopped in 120 seconds" >> "$setup_log" 2>&1
whiptail_setup_failed #whiptail_setup_failed
exit 1 exit 1
fi fi
sleep 1; sleep 1;
((LOOP_COUNT+=1)) ((LOOP_COUNT+=1))
done done
systemctl start "$service"; systemctl start "$service" >> "$setup_log" 2>&1
LOOP_COUNT=0 LOOP_COUNT=0
while ! check_service_status "$service"; do while ! check_service_status "$service"; do
echo "$service still not running" >> "$setup_log" 2>&1 echo "$service still not running" >> "$setup_log" 2>&1
if [ $LOOP_COUNT -gt 120 ]; then if [ $LOOP_COUNT -gt 120 ]; then
echo "$service could not be started in 120 seconds" >> "$setup_log" 2>&1 echo "$service could not be started in 120 seconds" >> "$setup_log" 2>&1
whiptail_setup_failed #whiptail_setup_failed
exit 1 exit 1
fi fi
sleep 1; sleep 1;
@@ -1444,9 +1446,9 @@ salt_checkin() {
LOOP_COUNT=0 LOOP_COUNT=0
while check_salt_master_status; do while check_salt_master_status; do
echo "salt-minion cannot talk to salt-master" >> "$setup_log" 2>&1 echo "salt-minion cannot talk to salt-master" >> "$setup_log" 2>&1
if [ $LOOP_COUNT -gt 20 ]; then if [ $LOOP_COUNT -gt 120 ]; then
echo "salt-minion could not talk to salt-master after 20 attempts" >> "$setup_log" 2>&1 echo "salt-minion could not talk to salt-master after 120 attempts" >> "$setup_log" 2>&1
whiptail_setup_failed #whiptail_setup_failed
exit 1 exit 1
fi fi
sleep 1; sleep 1;