Author: acoburn
Date: Wed Aug 8 16:49:51 2012
New Revision: 1370828
URL: http://svn.apache.org/viewvc?rev=1370828&view=rev
Log:
when the vcl daemon is started from the init.d scripts on CentOS/RHEL, the
start and stop functions don't produce the correct
output to the screen. This has been fixed. Also, when verbose mode is turned
OFF, certain output is sent to the screen when
this script is run, rather than to a logfile. Both of these issues have been
fixed.
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/bin/S99vcld.linux
vcl/branches/vcl-2.3-bugfixes/managementnode/bin/vcld
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm
vcl/trunk/managementnode/bin/S99vcld.linux
vcl/trunk/managementnode/bin/vcld
vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: vcl/branches/vcl-2.3-bugfixes/managementnode/bin/S99vcld.linux
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/bin/S99vcld.linux?rev=1370828&r1=1370827&r2=1370828&view=diff
==============================================================================
--- vcl/branches/vcl-2.3-bugfixes/managementnode/bin/S99vcld.linux (original)
+++ vcl/branches/vcl-2.3-bugfixes/managementnode/bin/S99vcld.linux Wed Aug 8
16:49:51 2012
@@ -51,20 +51,28 @@ umask 077
start() {
echo -n $"Starting $DAEMON daemon: "
- echo
daemon $DAEMON_PATH/$DAEMON $DAEMON_OPTIONS
RETVAL=$?
+ if [ $RETVAL -eq 0 ]; then
+ success
+ touch /var/lock/subsys/$DAEMON
+ else
+ failure
+ fi
echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$DAEMON
return $RETVAL
}
stop() {
echo -n $"Shutting down $DAEMON daemon: "
- #killproc $DAEMON_PATH/$DAEMON
- kill -9 `/bin/cat /var/run/$DAEMON.pid`
- #RETVAL=$?
+ kill -9 `/bin/cat /var/run/$DAEMON.pid` 2>/dev/null
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ]; then
+ rm -f /var/lock/subsys/$DAEMON
+ success
+ else
+ failure
+ fi
echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$DAEMON
return $RETVAL
}
_status() {
@@ -72,9 +80,6 @@ _status() {
}
restart() {
stop
- #echo -n $"Shutting down $DAEMON daemon: "
- #killproc $DAEMON_PATH/$DAEMON
- #kill -9 `/bin/cat /var/run/$DAEMON.pid`
sleep 1
start
}
Modified: vcl/branches/vcl-2.3-bugfixes/managementnode/bin/vcld
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/bin/vcld?rev=1370828&r1=1370827&r2=1370828&view=diff
==============================================================================
--- vcl/branches/vcl-2.3-bugfixes/managementnode/bin/vcld (original)
+++ vcl/branches/vcl-2.3-bugfixes/managementnode/bin/vcld Wed Aug 8 16:49:51
2012
@@ -774,13 +774,13 @@ sub daemonize {
close(PIDFILE);
preplogfile();
- print "Created VCL daemon process: $$\n";
#Redirect STDIN,STDOUT,STDERR
open STDIN, '/dev/null' or die "Can't read /dev/null $!";
open STDOUT, ">>$LOGFILE" or die "Can't write $LOGFILE $!";
open STDERR, ">>$LOGFILE" or die "Can't write $LOGFILE $!";
+ print "Created VCL daemon process: $$\n";
} ## end sub daemonize
Modified: vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm?rev=1370828&r1=1370827&r2=1370828&view=diff
==============================================================================
--- vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm (original)
+++ vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/utils.pm Wed Aug 8
16:49:51 2012
@@ -587,9 +587,9 @@ EOF
}
print LOGFILE $process_info;
close(LOGFILE);
- }
-
- print STDOUT $process_info;
+ } else {
+ print STDOUT $process_info;
+ }
}
#/////////////////////////////////////////////////////////////////////////////
Modified: vcl/trunk/managementnode/bin/S99vcld.linux
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/bin/S99vcld.linux?rev=1370828&r1=1370827&r2=1370828&view=diff
==============================================================================
--- vcl/trunk/managementnode/bin/S99vcld.linux (original)
+++ vcl/trunk/managementnode/bin/S99vcld.linux Wed Aug 8 16:49:51 2012
@@ -51,20 +51,28 @@ umask 077
start() {
echo -n $"Starting $DAEMON daemon: "
- echo
daemon $DAEMON_PATH/$DAEMON $DAEMON_OPTIONS
RETVAL=$?
+ if [ $RETVAL -eq 0 ]; then
+ success
+ touch /var/lock/subsys/$DAEMON
+ else
+ failure
+ fi
echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$DAEMON
return $RETVAL
}
stop() {
echo -n $"Shutting down $DAEMON daemon: "
- #killproc $DAEMON_PATH/$DAEMON
- kill -9 `/bin/cat /var/run/$DAEMON.pid`
- #RETVAL=$?
+ kill -9 `/bin/cat /var/run/$DAEMON.pid` 2>/dev/null
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ]; then
+ rm -f /var/lock/subsys/$DAEMON
+ success
+ else
+ failure
+ fi
echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$DAEMON
return $RETVAL
}
_status() {
@@ -72,9 +80,6 @@ _status() {
}
restart() {
stop
- #echo -n $"Shutting down $DAEMON daemon: "
- #killproc $DAEMON_PATH/$DAEMON
- #kill -9 `/bin/cat /var/run/$DAEMON.pid`
sleep 1
start
}
Modified: vcl/trunk/managementnode/bin/vcld
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/bin/vcld?rev=1370828&r1=1370827&r2=1370828&view=diff
==============================================================================
--- vcl/trunk/managementnode/bin/vcld (original)
+++ vcl/trunk/managementnode/bin/vcld Wed Aug 8 16:49:51 2012
@@ -774,13 +774,13 @@ sub daemonize {
close(PIDFILE);
preplogfile();
- print "Created VCL daemon process: $$\n";
#Redirect STDIN,STDOUT,STDERR
open STDIN, '/dev/null' or die "Can't read /dev/null $!";
open STDOUT, ">>$LOGFILE" or die "Can't write $LOGFILE $!";
open STDERR, ">>$LOGFILE" or die "Can't write $LOGFILE $!";
+ print "Created VCL daemon process: $$\n";
} ## end sub daemonize
Modified: vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=1370828&r1=1370827&r2=1370828&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/utils.pm Wed Aug 8 16:49:51 2012
@@ -587,9 +587,9 @@ EOF
}
print LOGFILE $process_info;
close(LOGFILE);
- }
-
- print STDOUT $process_info;
+ } else {
+ print STDOUT $process_info;
+ }
}
#/////////////////////////////////////////////////////////////////////////////
