Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid -u parameter when using the OS crontab for WMAgent #1564

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Avoid -u parameter when using the OS crontab for WMAgent #1564

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b755d23
Avoid -u parameter when using the OS crontab for WMAgent
todor-ivanov Nov 14, 2024
01105c1
Fix hardcoded path in set_cronjob
todor-ivanov Nov 21, 2024
db6b594
Activate the environment for virt. env. cronjobs
todor-ivanov Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions docker/pypi/wmagent/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,17 @@ set_cronjob() {
echo "Start: $stepMsg"
local errVal=0

# Avoid -u parameter when using the OS crontab
_is_venv && crontabParams="" || crontabParams="-u $WMA_USER"

# Activate the environment if cronjobs are to run under virtual env
_is_venv && crontabEnvStr="source $WMA_ROOT_DIR/bin/activate > /dev/null && " || crontabEnvStr=""

# Populating proxy related cronjobs
crontab -u $WMA_USER - <<EOF
55 */12 * * * date -Im >> $WMA_LOG_DIR/renew-proxy.log && $WMA_MANAGE_DIR/manage renew-proxy 2>&1 >> $WMA_LOG_DIR/renew-proxy.log
58 */12 * * * python $WMA_DEPLOY_DIR/deploy/checkProxy.py --proxy /data/certs/myproxy.pem --time 120 --send-mail True --mail [email protected]
*/15 * * * * source $WMA_DEPLOY_DIR/deploy/restartComponent.sh 2>&1 >> $WMA_LOG_DIR/component-restart.log
crontab $crontabParams - <<EOF
55 */12 * * * $crontabEnvStr date -Im >> $WMA_LOG_DIR/renew-proxy.log && $WMA_MANAGE_DIR/manage renew-proxy 2>&1 >> $WMA_LOG_DIR/renew-proxy.log
58 */12 * * * $crontabEnvStr python $WMA_DEPLOY_DIR/deploy/checkProxy.py --proxy $X509_USER_PROXY --time 120 --send-mail True --mail [email protected]
*/15 * * * * $crontabEnvStr source $WMA_DEPLOY_DIR/deploy/restartComponent.sh 2>&1 >> $WMA_LOG_DIR/component-restart.log
EOF
let errVal+=$?

Expand Down