diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2021-08-19 07:33:43 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2021-08-19 09:20:40 +0000 |
| commit | a6291c99e0d44a3117dc0f019fa1f43871355809 (patch) | |
| tree | 0577c76eecfcdf3e02758ec16b02a36629960a3e /bin/container | |
| parent | Shortening Makefile for different bootstrap script modes. (diff) | |
| download | compute-tools-a6291c99e0d44a3117dc0f019fa1f43871355809.tar.xz compute-tools-a6291c99e0d44a3117dc0f019fa1f43871355809.zip | |
Moving irc-notification in container program into hook.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
| -rwxr-xr-x | bin/container | 54 |
1 files changed, 14 insertions, 40 deletions
diff --git a/bin/container b/bin/container index 68e3965..338cce7 100755 --- a/bin/container +++ b/bin/container @@ -62,46 +62,20 @@ do fi done - # Notification - if echo "${OPTIONS}" | grep -qs "\--no-notification" - then - OPTIONS="$(echo "${OPTIONS}" | sed -e 's|--no-notification||')" - else - case "${COMMAND}" in - build|b|get|g|move|mv|remove|rm|restart|rt|start|s|stop|t|update|u) - if [ -z "${CONTAINER_USER}" ] - then - CONTAINER_USER="${SUDO_USER:-${USER}}" - fi - - DATE="$(date +%Y-%m-%d\ %H:%M:%S)" - HOST="$(hostname -f 2> /dev/null || hostname)" - - # logfile - echo "${DATE} ${HOST} ${CONTAINER_USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${SOFTWARE}/${PROGRAM}.log" - - # irc - if [ -e /usr/bin/irk ] - then - for FILE in "/etc/${SOFTWARE}/${PROGRAM}.conf" "/etc/${SOFTWARE}/${PROGRAM}.conf.d"/*.conf - do - if [ -e "${FILE}" ] - then - . "${FILE}" - fi - done - - if [ -n "${IRK_TARGETS}" ] - then - for TARGET in ${IRK_TARGETS} - do - irk "${TARGET}" "\x0300${CONTAINER_USER}\x03@\x0312${HOST}:\x03 \x0303${PROGRAM}\x03 \x0307${COMMAND}\x03 ${OPTIONS}" - done - fi - fi - ;; - esac - fi + # logfile + case "${COMMAND}" in + build|b|get|g|move|mv|remove|rm|restart|rt|start|s|stop|t|update|u) + if [ -z "${CONTAINER_USER}" ] + then + CONTAINER_USER="${SUDO_USER:-${USER}}" + fi + + DATE="$(date +%Y-%m-%d\ %H:%M:%S)" + HOST="$(hostname -f 2> /dev/null || hostname)" + + echo "${DATE} ${HOST} ${CONTAINER_USER} ${PROGRAM} ${COMMAND} ${OPTIONS}" >> "/var/log/${SOFTWARE}/${PROGRAM}.log" + ;; + esac # Run "/usr/libexec/${PROGRAM}/${COMMAND}" "${OPTIONS}" |