x2gobroker.git - master (branch) updated: 0.0.2.3-134-g4a138b8 - x2go-commits

20 Dec 2013

The branch, master has been updated
       via  4a138b8dc508f36034a6020c2b4ba104b981cbb2 (commit)
      from  e488cf4b69f877fd0fe83caf39fbd36bcb33367e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4a138b8dc508f36034a6020c2b4ba104b981cbb2
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Dec 20 14:27:14 2013 +0100

    x2gobroker.spec: rework init scripts for EPEL-6

-----------------------------------------------------------------------

Summary of changes:
 bin/x2gobroker                  |    2 +-
 rpm/x2gobroker-authservice.init |   27 +++++++++++++++++++--------
 rpm/x2gobroker-daemon.init      |   24 +++++++++++++++++-------
 sbin/x2gobroker-authservice     |    2 +-
 4 files changed, 38 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 rpm/x2gobroker-authservice.init
 mode change 100644 => 100755 rpm/x2gobroker-daemon.init

The diff of changes is:

diff --git a/bin/x2gobroker b/bin/x2gobroker
index 8e54b27..a505f30 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -276,8 +276,8 @@ if __name__ == "__main__":
                 keep_fds = [int(fd) for fd in os.listdir('/proc/self/fd') if fd not in (0,1,2) ]
                 daemon_stdout = file(daemon_logdir+'x2gobroker-daemon.stdout', 'w+')
                 daemon_stderr = file(daemon_logdir+'x2gobroker-daemon.stderr', 'w+')
-                file(pidfile, 'w+').write(str(os.getpid()))
                 with daemon.DaemonContext(stdout=daemon_stdout, stderr=daemon_stderr, files_preserve=keep_fds, umask=0o027, pidfile=lockfile.FileLock(pidfile)):
+                    file(pidfile, 'w+').write(str(os.getpid()))
                     launch_ioloop()
             else:
                 launch_ioloop()
diff --git a/rpm/x2gobroker-authservice.init b/rpm/x2gobroker-authservice.init
old mode 100644
new mode 100755
index b73ce43..7dd3567
--- a/rpm/x2gobroker-authservice.init
+++ b/rpm/x2gobroker-authservice.init
@@ -15,13 +15,14 @@
 # Description:       PAM authentication service for X2Go Session Broker
 ### END INIT INFO
 
-set -e
-
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+set -xe
+
 AUTHSERVICE=/usr/sbin/x2gobroker-authservice
 test -d /run && RUNDIR=/run || RUNDIR=/var/run
+PIDFILE_AUTHSERVICE=$RUNDIR/x2gobroker/x2gobroker-authservice.pid
 DEFAULTCONFIG_COMMON=/etc/default/python-x2gobroker
 DEFAULTCONFIG_AUTHSERVICE=/etc/default/x2gobroker-authservice
 
@@ -50,7 +51,7 @@ export X2GOBROKER_AUTHSERVICE_SOCKET
 exec=$AUTHSERVICE
 prog=$(basename $AUTHSERVICE)
 config=$DEFAULTCONFIG_AUTHSERVICE
-OPTS="-D -s $X2GOBROKER_AUTHSERVICE_SOCKET -o root -g $X2GOBROKER_DAEMON_GROUP -p 0660"
+OPTS="-D -P $PIDFILE_AUTHSERVICE -s $X2GOBROKER_AUTHSERVICE_SOCKET -o root -g $X2GOBROKER_DAEMON_GROUP -p 0660"
 
 lockfile=/var/lock/subsys/$prog
 
@@ -66,14 +67,13 @@ is_true()
 
 start() {
 [ -x $exec ] || exit 5
-	if ps a -u root | grep $(basename $AUTHSERVICE) 1>/dev/null 2>/dev/null; then
+	if ps a -u root | grep -v grep | grep $AUTHSERVICE 1>/dev/null 2>/dev/null; then
 		echo "X2Go Broker Authentication Service already running"
 		START_AUTHSERVICE=no
 	fi
 	if is_true $START_AUTHSERVICE; then
 		# Make sure these are created by default so that nobody else can
 		echo -n $"Starting $prog: "
-		rm -f $X2GOBROKER_AUTHSERVICE_SOCKET
 		set +e
 		daemon $exec $OPTS
 		retval=$?
@@ -87,11 +87,12 @@ start() {
 stop() {
 	echo -n $"Stopping $prog: "
 	set +e
-	killproc $exec
+	killproc -p $PIDFILE_AUTHSERVICE $exec
 	retval=$?
 	set -e
 	echo
 	rm -f $lockfile
+	return $retval
 }
 
 
@@ -113,39 +114,49 @@ force_reload() {
 
 rh_status() {
 	# run checks to determine if the service is running or use generic status
-	status $prog
+	status -p $PIDFILE_AUTHSERVICE $exec
 }
 
 
 rh_status_q() {
-	rh_status >/dev/null 2>&1
+	rh_status 1>/dev/null 2>&1
 }
 
 
 case "$1" in
 	start)
+		set +e
 		rh_status_q && exit 0
+		set -e
 		$1
 		;;
 	stop)
+		set +e
 		rh_status_q || exit 0
+		set -e
 		$1
 		;;
 	restart)
 		$1
 		;;
 	reload)
+		set +e
 		rh_status_q || exit 7
+		set -e
 		$1
 		;;
 	force-reload)
 		force_reload
 		;;
 	status)
+		set +e
 		rh_status
+		set -e
 		;;
 	condrestart|try-restart)
+		set +e
 		rh_status_q || exit 0
+		set -e
 		restart
 		;;
 	*)
diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init
old mode 100644
new mode 100755
index b653a17..83da87f
--- a/rpm/x2gobroker-daemon.init
+++ b/rpm/x2gobroker-daemon.init
@@ -15,7 +15,10 @@
 # Description:      X2Go Session Broker comes with its own HTTP daemon
 ### END INIT INFO
 
-set -e
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+set -ex
 
 DAEMON=/usr/bin/x2gobroker
 test -d /run && RUNDIR=/run || RUNDIR=/var/run
@@ -63,9 +66,6 @@ export X2GOBROKER_AUTHSERVICE_SOCKET
 export X2GOBROKER_SSL_CERTFILE
 export X2GOBROKER_SSL_KEYFILE
 
-# Source function library.
-. /etc/rc.d/init.d/functions
-
 exec=$DAEMON
 prog=$(basename $DAEMON)
 config=$DEFAULTCONFIG_DAEMON
@@ -75,7 +75,7 @@ lockfile=/var/lock/subsys/$prog
 
 start() {
 [ -x $exec ] || exit 5
-	if ps a -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then
+	if ps a -u $X2GOBROKER_DAEMON_USER | grep -v grep | grep $DAEMON 1>/dev/null 2>/dev/null; then
 		echo "X2Go Session Broker already running"
 		START_BROKER=no
 	fi
@@ -92,7 +92,7 @@ start() {
 
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc $exec
+	killproc -p $PIDFILE_BROKER $exec
 	retval=$?
 	echo
 	rm -f $lockfile
@@ -113,7 +113,7 @@ force_reload() {
 
 rh_status() {
 	# run checks to determine if the service is running or use generic status
-	status $prog
+	status -p $PIDFILE_BROKER $exec
 }
 
 rh_status_q() {
@@ -123,28 +123,38 @@ rh_status_q() {
 
 case "$1" in
 	start)
+		set +e
 		rh_status_q && exit 0
+		set -e
 		$1
 		;;
 	stop)
+		set +e
 		rh_status_q || exit 0
+		set -e
 		$1
 		;;
 	restart)
 		$1
 		;;
 	reload)
+		set +e
 		rh_status_q || exit 7
+		set -e
 		$1
 		;;
 	force-reload)
 		force_reload
 		;;
 	status)
+		set +e
 		rh_status
+		set -e
 		;;
 	condrestart|try-restart)
+		set +e
 		rh_status_q || exit 0
+		set -e
 		restart
 		;;
 	*)
diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice
index ff9bbff..5aae163 100755
--- a/sbin/x2gobroker-authservice
+++ b/sbin/x2gobroker-authservice
@@ -240,8 +240,8 @@ if __name__ == '__main__':
             keep_fds = [int(fd) for fd in os.listdir('/proc/self/fd') if fd not in (0,1,2) ]
             daemon_stdout = file(daemon_logdir+'x2gobroker-authservice.stdout', 'w+')
             daemon_stderr = file(daemon_logdir+'x2gobroker-authservice.stderr', 'w+')
-            file(pidfile, 'w+').write(str(os.getpid()))
             with daemon.DaemonContext(stdout=daemon_stdout, stderr=daemon_stderr, files_preserve=keep_fds, umask=0o027, pidfile=lockfile.FileLock(pidfile)):
+                file(pidfile, 'w+').write(str(os.getpid())+"\n")
                 loop()
         else:
             loop()


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

    