[X2Go-Commits] x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.2-24-gf092880
X2Go dev team
git-admin at x2go.org
Thu Jun 6 13:33:14 CEST 2013
The branch, release/4.0.0.x has been updated
via f0928803d9cf47f380996a19286bbc04c947be8f (commit)
from a313c11ae15f9d11fb90a1d66eefc2b75988cdf8 (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 f0928803d9cf47f380996a19286bbc04c947be8f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jun 6 13:28:59 2013 +0200
Revert "Add support for terminating sessions via the session DB."
This reverts commit cc0d73077ae178488672ae919e7225a8ac5415b1.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 -
x2goserver/bin/x2goterminate-session | 1 +
x2goserver/sbin/x2gocleansessions | 10 ----------
3 files changed, 1 insertion(+), 11 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9754354..4012bda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low
- Make x2gomountdirs / x2goumount-session UNC path aware.
- Add support to x2gocleansessions to suspend session via state changes
in the session DB.
- - Add support for terminating sessions via the session DB.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index f8b3881..9819498 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -60,3 +60,4 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && {
}
+
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index d9f26a9..0be7cee 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -160,16 +160,6 @@ elsif ($pid == 0 )
syslog('debug', "@sinfo[1] was found running and has now been suspended");
}
}
- if (@sinfo[4]eq 'T')
- {
- if (!has_terminated(@sinfo[1], at sinfo[11]))
- {
- syslog('debug', "@sinfo[1]: unmounting all shares");
- system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null");
- system("su @sinfo[11] -c \"x2goterminate-session @sinfo[1] \" > /dev/null");
- syslog('debug', "@sinfo[1] has been requested for termination via the session DB");
- }
- }
}
}
}
hooks/post-receive
--
x2goserver.git (X2Go Server)
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 "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list