From 7b49eda53a513ade5c3ed7e6229fa48f2edcf00b Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Wed, 27 Nov 2024 09:15:20 +0100 Subject: [PATCH 1/2] Fix broken cron jobs redirect --- docker/pypi/wmagent/init.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/pypi/wmagent/init.sh b/docker/pypi/wmagent/init.sh index ebce604f8..39e077a1e 100755 --- a/docker/pypi/wmagent/init.sh +++ b/docker/pypi/wmagent/init.sh @@ -337,9 +337,9 @@ set_cronjob() { # Populating proxy related cronjobs crontab $crontabParams - <> $WMA_LOG_DIR/renew-proxy.log && $WMA_MANAGE_DIR/manage renew-proxy 2>&1 >> $WMA_LOG_DIR/renew-proxy.log +55 */12 * * * $crontabEnvStr date -Im >> $WMA_LOG_DIR/renew-proxy.log && $WMA_MANAGE_DIR/manage renew-proxy >> $WMA_LOG_DIR/renew-proxy.log 2>&1 58 */12 * * * $crontabEnvStr python $WMA_DEPLOY_DIR/deploy/checkProxy.py --proxy $X509_USER_PROXY --time 120 --send-mail True --mail alan.malta@cern.ch -*/15 * * * * $crontabEnvStr source $WMA_DEPLOY_DIR/deploy/restartComponent.sh 2>&1 >> $WMA_LOG_DIR/component-restart.log +*/15 * * * * $crontabEnvStr source $WMA_DEPLOY_DIR/deploy/restartComponent.sh >> $WMA_LOG_DIR/component-restart.log 2>&1 EOF let errVal+=$? From 9108c625d8977a618f355900955e9c551ab7bc08 Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Wed, 27 Nov 2024 11:34:13 +0100 Subject: [PATCH 2/2] Not sourcing but running restartComponent.sh --- docker/pypi/wmagent/init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/pypi/wmagent/init.sh b/docker/pypi/wmagent/init.sh index 39e077a1e..e0cf79248 100755 --- a/docker/pypi/wmagent/init.sh +++ b/docker/pypi/wmagent/init.sh @@ -339,7 +339,7 @@ set_cronjob() { crontab $crontabParams - <> $WMA_LOG_DIR/renew-proxy.log && $WMA_MANAGE_DIR/manage renew-proxy >> $WMA_LOG_DIR/renew-proxy.log 2>&1 58 */12 * * * $crontabEnvStr python $WMA_DEPLOY_DIR/deploy/checkProxy.py --proxy $X509_USER_PROXY --time 120 --send-mail True --mail alan.malta@cern.ch -*/15 * * * * $crontabEnvStr source $WMA_DEPLOY_DIR/deploy/restartComponent.sh >> $WMA_LOG_DIR/component-restart.log 2>&1 +*/15 * * * * $crontabEnvStr $WMA_DEPLOY_DIR/deploy/restartComponent.sh >> $WMA_LOG_DIR/component-restart.log 2>&1 EOF let errVal+=$?