From d9b24135c7af8e0b099ceb71b3b355e963344cf8 Mon Sep 17 00:00:00 2001 From: Javier Sánchez Parra Date: Mon, 6 Apr 2020 12:35:26 +0200 Subject: #927 Remove opengnsys.cron script This commit removes the opengnsys cron script that checks if the ogAdmServer is running or using too much CPU and restarts the process. Now that the ogAdmServer is more stable this script is not needed. Also, without this script we are going to know better when the ogAdmServer is having a problem and get better reports. In case you observe a crash in ogAdmServer, please, run it under valgrind: valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --verbose --log-file=/tmp/ogadmserver-valgrind-out.log /opt/opengnsys/sbin/ogAdmServer -f /opt/opengnsys/etc/ogAdmServer.cfg And post your 'ogadmserver-valgrind-out.log' file to the mailing list. This patch changes the installer and the update scripts too. They do not configure opengnsys.cron anymore. The update script search and remove the deprecated files as well. --- installer/opengnsys_installer.sh | 1 - installer/opengnsys_update.sh | 5 ++++- repoman/bin/opengnsys.cron | 34 ---------------------------------- 3 files changed, 4 insertions(+), 36 deletions(-) delete mode 100755 repoman/bin/opengnsys.cron diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index dcc02270..ef87956b 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -1472,7 +1472,6 @@ function openGnsysConfigure() /etc/default/opengnsys fi echoAndLog "${FUNCNAME}(): Creating cron files." - echo "* * * * * root [ -x $INSTALL_TARGET/bin/opengnsys.cron ] && $INSTALL_TARGET/bin/opengnsys.cron" > /etc/cron.d/opengnsys echo "* * * * * root [ -x $INSTALL_TARGET/bin/torrent-creator ] && $INSTALL_TARGET/bin/torrent-creator" > /etc/cron.d/torrentcreator echo "5 * * * * root [ -x $INSTALL_TARGET/bin/torrent-tracker ] && $INSTALL_TARGET/bin/torrent-tracker" > /etc/cron.d/torrenttracker echo "* * * * * root [ -x $INSTALL_TARGET/bin/deletepreimage ] && $INSTALL_TARGET/bin/deletepreimage" > /etc/cron.d/imagedelete diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index 151d0b1b..c1ff2a5d 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -996,12 +996,15 @@ function updateServerFiles() fi echoAndLog "${FUNCNAME}(): updating cron files" - [ ! -f /etc/cron.d/opengnsys ] && echo "* * * * * root [ -x $INSTALL_TARGET/bin/opengnsys.cron ] && $INSTALL_TARGET/bin/opengnsys.cron" > /etc/cron.d/opengnsys [ ! -f /etc/cron.d/torrentcreator ] && echo "* * * * * root [ -x $INSTALL_TARGET/bin/torrent-creator ] && $INSTALL_TARGET/bin/torrent-creator" > /etc/cron.d/torrentcreator [ ! -f /etc/cron.d/torrenttracker ] && echo "5 * * * * root [ -x $INSTALL_TARGET/bin/torrent-tracker ] && $INSTALL_TARGET/bin/torrent-tracker" > /etc/cron.d/torrenttracker [ ! -f /etc/cron.d/imagedelete ] && echo "* * * * * root [ -x $INSTALL_TARGET/bin/deletepreimage ] && $INSTALL_TARGET/bin/deletepreimage" > /etc/cron.d/imagedelete [ ! -f /etc/cron.d/ogagentqueue ] && echo "* * * * * root [ -x $INSTALL_TARGET/bin/ogagentqueue.cron ] && $INSTALL_TARGET/bin/ogagentqueue.cron" > /etc/cron.d/ogagentqueue + echoAndLog "${FUNCNAME}(): deleting deprecated cron file" + [ -e /etc/cron.d/opengnsys ] && rm -f /etc/cron.d/opengnsys \ + $INSTALL_TARGET/bin/opengnsys.cron + # Se modifican los nombres de las plantilla PXE por compatibilidad con los equipos UEFI. if [ -f $INSTALL_TARGET/tftpboot/menu.lst/templates/01 ]; then BIOSPXEDIR="$INSTALL_TARGET/tftpboot/menu.lst/templates" diff --git a/repoman/bin/opengnsys.cron b/repoman/bin/opengnsys.cron deleted file mode 100755 index 32c6f493..00000000 --- a/repoman/bin/opengnsys.cron +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# opengnsys.cron - Script para comprobar si los servicios de OpenGnsys están levantados -# e iniciarlos automáticamente. -# Nota: este script debe ser lanzado por Cron cada minuto. - - -# Variables. -OPENGNSYS=${OPENGNSYS:-"/opt/opengnsys"} -LOGDIR="$OPENGNSYS/log" -DEFAULTFILE=/etc/default/opengnsys -typeset -i OGCPU # % uso CPU - -# Comprobar servicios que deben estar activos. -[ -f $DEFAULTFILE ] && source $DEFAULTFILE - -# Salir si no se debe ejecutar la revisión en el cron. -[ "$RUN_CRONJOB" == "no" ] && exit - -# Comprobar si está activo el servidor OpenGnsys. -if [ "$RUN_OGADMSERVER" == "yes" ]; then - # Parar procesos ogAdmServer si consume más de 90% de CPU. - OGPID=$(pgrep ogAdmServer) - OGCPU=$(top -b -n 1 -p $OGPID 2>/dev/null | awk -v p=$OGPID '$1~p {printf "%d",$9}') - if [ $OGCPU -gt 90 ]; then - date +"%d/%m/%Y %H:%M AVISO: ogAdmServer (PID=$OGPID) parado, consumiendo $OGCPU % de CPU" >> $LOGDIR/ogAdmServer.log - kill -9 $OGPID - fi - # Reiniciar servicios si proceso ogAdmServer está caído. - if ! pgrep ogAdmServer >/dev/null; then - date +"%d/%m/%Y %H:%M ERROR: El servicio ogAdmServer estaba caido, se reinicia" >> $LOGDIR/ogAdmServer.log - /etc/init.d/opengnsys restart - fi -fi - -- cgit v1.2.3-18-g5258