[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.1-19-g1fe7447

X2Go dev team git-admin at x2go.org
Sun May 19 13:03:10 CEST 2013


The branch, build-main has been updated
       via  1fe7447ef8efa17ac2fd290cc449c6d1b9078edc (commit)
      from  43e490a1fa111dde08d7b05d73fe144c3ca24b52 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    2 ++
 debian/x2gobroker-daemon.init |   11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 179b474..ba7337d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low
       PID file directory.
   * /debian/control:
     + Add bin:package x2gobroker-agent.
+  * /debian/x2gobroker-daemon.init:
+    + Handle stale PID file and already running daemon.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 13 Feb 2013 12:03:25 +0100
 
diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init
index 2a5dd46..1c2d724 100755
--- a/debian/x2gobroker-daemon.init
+++ b/debian/x2gobroker-daemon.init
@@ -69,9 +69,16 @@ is_true()
 
 case "${1:-}" in
   start)
+    if [ -e $PIDFILE ]; then
+	if ps -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then
+	    log_warning_msg "X2Go Session Broker already running"
+	else
+	    log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE). Delete it manually!"
+	fi
+	START_DAEMON=no
+    fi
     if is_true $START_DAEMON; then
-      log_daemon_msg "Starting X2Go Session Broker standalone daemon" "x2gobroker"
-      mkdir -p $RUNDIR
+      log_daemon_msg "Starting X2Go Session Broker standalone daemon" $(basename $DAEMON)
       set +e
       start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE -x $DAEMON -- -b $DAEMON_BIND_ADDRESS
       log_end_msg $?


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).




More information about the x2go-commits mailing list