[fix] proxy and certbot now exit properly with code 0

- also fixed (currently not used) saving log to file
This commit is contained in:
2020-05-23 08:06:05 -04:00
parent 76096a037d
commit 3d778ff698
2 changed files with 51 additions and 9 deletions

View File

@@ -40,11 +40,27 @@ function log()
echo "[$time]:[$prefix]:[$0][$func]: $@" 2>&1
;;
*)
echo "[$time]:[$prefix]:[$0][$func]: $@" >> log_path
echo "[$time]:[$prefix]:[$0][$func]: $@" >> $log_file
;;
esac
}
function sleep_wait()
{
# waiting on sleep to be able to handle SIGTERM
sleep $1 &
wait $!
}
function exit_handler()
{
log exit_handler "container shutting down"
exit
}
trap "exit_handler" SIGINT
trap "exit_handler" SIGTERM
function env_domain_file()
{
log env_domain_file $(echo "ENV DOMAINS: $DOMAINS" | tr '\n' '#' | sed 's|#|\\n |g')
@@ -135,7 +151,7 @@ function get_cert()
while [ ! $webserver_exists -eq 1 ] && [ "$retries" -lt "$server_retries" ]; do
retries=$(( retries+1 ))
log get_cert WARNING "Webserver for [$root_domain] not reachable, trying again in 1s"
sleep 1
sleep_wait 1
verify_local_webserver $root_domain && webserver_exists=1
done
@@ -256,7 +272,7 @@ function main()
log main "Ending intervall"
log main "Next interval in $intervall"
sleep "$intervall"
sleep_wait "$intervall"
done
}