From 4532c10cb3df80151b8bf7e8a0a4acc449bf29b3 Mon Sep 17 00:00:00 2001 From: Doug Le Tough Date: Tue, 25 Jul 2017 12:55:26 +0200 Subject: [PATCH] "test sys_refresh_ref_cron.sh" --- bin/sys_refresh_ref_cron.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/bin/sys_refresh_ref_cron.sh b/bin/sys_refresh_ref_cron.sh index c9e82c5..cdd0ee6 100755 --- a/bin/sys_refresh_ref_cron.sh +++ b/bin/sys_refresh_ref_cron.sh @@ -170,19 +170,23 @@ function refresh_cronjobs if [ ${#CRONJOB} -gt 0 ]; then fct_message "Checking database:" CRONJOB="$@" - MINUTES=$(echo ${CRONJOB} | cut -d' ' -f1) - HOURS=$(echo ${CRONJOB} | cut -d' ' -f2) - DAYS=$(echo ${CRONJOB} | cut -d' ' -f3) - 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}'" + MINUTES=$(echo ${CRONJOB} | awk -F ' ' '{print $1}') + HOURS=$(echo ${CRONJOB} | awk -F ' ' '{print $2}') + DAYS=$(echo ${CRONJOB} | awk -F ' ' '{print $3}') + MONTHS=$(echo ${CRONJOB} | awk -F ' ' '{print $4}') + DAYOFWEEK=$(echo ${CRONJOB} | awk -F ' ' '{print $5}') + COMMAND=$(echo ${CRONJOB} | awk -F ' ' '{$1=$2=$3=$4=$5=""; print $0}') + 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