From 39729c1c23f5b6c048515d169a3795d13d1b2274 Mon Sep 17 00:00:00 2001 From: Doug Le Tough Date: Tue, 25 Jul 2017 12:50:21 +0200 Subject: [PATCH] "test sys_refresh_ref_cron.sh" --- bin/sys_refresh_ref_cron.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/bin/sys_refresh_ref_cron.sh b/bin/sys_refresh_ref_cron.sh index cc4bd27..c9e82c5 100755 --- a/bin/sys_refresh_ref_cron.sh +++ b/bin/sys_refresh_ref_cron.sh @@ -176,17 +176,13 @@ function refresh_cronjobs MONTHS=$(echo ${CRONJOB} | cut -d' ' -f4) DAYOFWEEK=$(echo ${CRONJOB} | cut -d' ' -f5) COMMAND=$(echo ${CRONJOB} | cut -d' ' -f6-) - REQUEST_ID_PARAMS="host='${VM}' and s_user='${TETALAB_USER}' and minutes='${MINUTES}' - and hours='${HOURS}' and days='${DAYS}' and daysofweek='${DAYSOFWEEKS}' and command='${COMMAND}'" + REQUEST_ID_PARAMS="host='${VM}' and s_user='${TETALAB_USER}' and minutes='${MINUTES}' and hours='${HOURS}' and days='${DAYS}' and daysofweek='${DAYSOFWEEKS}' and command='${COMMAND}'" RESULT=$(psql -t -h ${DB_HOST} -U ${DB_USER} -d ${DB_DATABASE} -c "select ID from ref_cron where ${REQUEST_ID_PARAMS};") if [ ${#RESULT} -eq 0 ]; then fct_message "Cronjob not in database, inserting..." - REQUEST_INSERT_PARAMS="'${VM}', '${TETALAB_USER}', '${MINUTES}', - '${HOURS}', '${DAYS}', '${DAYSOFWEEKS}', '${COMMAND}'" - psql -e -t -h ${DB_HOST} -U ${DB_USER} -d ${DB_DATABASE} -c "insert into ref_cron - (\"host\", \"s_user\", \"minutes\", \"hours\", \"days\", \"daysofweek\", \"command\") - values (${REQUEST_INSERT_PARAMS});" + REQUEST_INSERT_PARAMS="'${VM}', '${TETALAB_USER}', '${MINUTES}', '${HOURS}', '${DAYS}', '${DAYSOFWEEKS}', '${COMMAND}'" + psql -e -t -h ${DB_HOST} -U ${DB_USER} -d ${DB_DATABASE} -c "insert into ref_cron (\"host\", \"s_user\", \"minutes\", \"hours\", \"days\", \"daysofweek\", \"command\") values (${REQUEST_INSERT_PARAMS});" else fct_message "Cronjob already in database" fi