This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository telekinesis. commit 67b602f491265b9977fcb78950e8fb891453c503 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 7 13:39:53 2014 +0200 fix comments --- .../pre-suspend.d/100_telekinesis-server-suspend | 2 +- .../100_telekinesis-server-terminate | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend b/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend index 799695f..e4ec62a 100755 --- a/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend +++ b/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend @@ -25,7 +25,7 @@ X2GO_SESSIONINFO="$(x2golistsessions | grep $X2GO_SESSION)" TEKICTRL_PORT="$(echo $X2GO_SESSIONINFO | cut -d '|' -f15 | sed -e 's/[^0-9\-]//g')" TEKIDATA_LOCK="$HOME/.x2go/C-${X2GO_SESSION}/telekinesis-sftp.pid" -# if Telekinesis server is in use for this session, try to resume it +# if Telekinesis server is in use for this session, try to suspend it if [ -n "$TEKICTRL_PORT" ] && [ "x$TEKICTRL_PORT" != "x-1" ]; then tekicmd -setSESSIONSUSPEND=1 -setX2GOSID=${X2GO_SESSION} (if [ -f "$TEKIDATA_LOCK" ]; then diff --git a/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate b/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate index 799695f..dfeec80 100755 --- a/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate +++ b/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate @@ -25,7 +25,7 @@ X2GO_SESSIONINFO="$(x2golistsessions | grep $X2GO_SESSION)" TEKICTRL_PORT="$(echo $X2GO_SESSIONINFO | cut -d '|' -f15 | sed -e 's/[^0-9\-]//g')" TEKIDATA_LOCK="$HOME/.x2go/C-${X2GO_SESSION}/telekinesis-sftp.pid" -# if Telekinesis server is in use for this session, try to resume it +# the session is about to be terminated, suspend Telekinesis before that happens if [ -n "$TEKICTRL_PORT" ] && [ "x$TEKICTRL_PORT" != "x-1" ]; then tekicmd -setSESSIONSUSPEND=1 -setX2GOSID=${X2GO_SESSION} (if [ -f "$TEKIDATA_LOCK" ]; then -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git