[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-165-gccb0ef3

[X2Go dev team]

The branch, master has been updated
       via  ccb0ef3eb32d66055dc9af9bf2f4bad9323b0266 (commit)
      from  34e0dfba2da093cf5dffc501666cd6c35b859cc9 (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 ccb0ef3eb32d66055dc9af9bf2f4bad9323b0266
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 4 23:39:42 2013 +0200

    Add support for terminating sessions via the session DB.

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

Summary of changes:
 debian/changelog                     |    1 +
 x2goserver/bin/x2goterminate-session |    1 -
 x2goserver/sbin/x2gocleansessions    |   10 ++++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cc9fbbe..cadc41c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,7 @@ 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 2570220..a4beeca 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -69,4 +69,3 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && {
 
 }
 
-
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index 76ab52b..76f3cd4 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -158,6 +158,16 @@ 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).