From 4816ea56b0dbdf230c0db685bb6924da157b2c56 Mon Sep 17 00:00:00 2001 From: Javier Sánchez Parra Date: Tue, 21 Apr 2020 13:42:21 +0200 Subject: #971 Remove ogAdmAgent initialization All the functionalities of the ogAdmAgent are now in the ogAdmServer. So, the it is not needed anymore. This commit remove the installation and update of the ogAdmAgent, adds a check to remove it if exists and removes it from the OpenGnsys init script. A future patch will remove all the code related to the ogAdmAgent. --- admin/Sources/Services/opengnsys.init | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'admin/Sources/Services/opengnsys.init') diff --git a/admin/Sources/Services/opengnsys.init b/admin/Sources/Services/opengnsys.init index ae27593b..ef5a5b8c 100755 --- a/admin/Sources/Services/opengnsys.init +++ b/admin/Sources/Services/opengnsys.init @@ -41,15 +41,6 @@ SERVERAUXDAEMON=$BASEDIR/sbin/$SERVERAUXNAME SERVERAUXPORT=2011 ############# IRINA -# -# Servidor de tareas programadas -# -AGENTNAME=ogAdmAgent -AGENTDAEMON=$BASEDIR/sbin/$AGENTNAME -AGENTCFG=$BASEDIR/etc/$AGENTNAME.cfg -AGENTLOG=$BASEDIR/log/$AGENTNAME.log -AGENTDAEMON_OPTIONS="-f $AGENTCFG -l $AGENTLOG" - # # Opciones Bittorrent # @@ -155,14 +146,6 @@ arranca_demonios() { faucet $REPOAUXPORT --daemon --in bash -c "$REPOAUXDAEMON" [ $? = 0 ] && $SUCCESSMSG || $FAILMSG fi - if [ $RUN_OGADMSERVER = "yes" ] && [ $RUN_OGADMAGENT = "yes" ]; then - sleep 5 # Damos tiempo a que ogAdmServer este funcionando - fi - if [ $RUN_OGADMAGENT = "yes" ]; then - $ACTIONMSG "Iniciando demonio: $AGENTNAME" - $DAEMONSTART $AGENTDAEMON $EXTRAOPTS $AGENTDAEMON_OPTIONS $ENDOPTS - [ $? = 0 ] && $SUCCESSMSG || $FAILMSG - fi if [ $RUN_BTTRACKER = "yes" ]; then $ACTIONMSG "Iniciando demonio: $BTTRACK" $TRACKERSTART $BTTRACK $EXTRAOPTS $BTTRACK_OPTIONS $ENDOPTS @@ -189,9 +172,6 @@ para_demonios() { [ $? = 0 ] && $SUCCESSMSG || $FAILMSG rm -f $BTTRACKPID fi - $ACTIONMSG "Parando demonio: $AGENTNAME" - $DAEMONSTOP $AGENTNAME - [ $? = 0 ] && $SUCCESSMSG || $FAILMSG $ACTIONMSG "Parando demonio: $REPOAUXNAME" pkill faucet [ $? -le 1 ] && $SUCCESSMSG || $FAILMSG -- cgit v1.2.3-18-g5258