[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.9-12-g93b733a

[X2Go dev team]

The branch, release/4.0.1.x has been updated
       via  93b733a2a6483b76507839d472d289b33899e104 (commit)
      from  14900d5b5532b878d37a7dad071bf3c3d0779707 (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 93b733a2a6483b76507839d472d289b33899e104
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 7 23:19:24 2013 +0100

    Improve parsing of the NX session.log file where unexpected extra logging takes place during session suspension/resumption. Thanks to Gerald Richter for finding this!!! (Fixes: #356).

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

Summary of changes:
 debian/changelog                  |   10 +++++++---
 x2goserver/sbin/x2gocleansessions |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b1cfef0..27e90f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -150,9 +150,13 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low
 
 x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low
 
-  * Use mktemp instead of tempfile (because Fedora does not have the tempfile
-    binary). (Fixes: #347).
-  * Replace makepasswd by pwgen (because Fedora does not have makepasswd).
+  * New upstream version (4.0.0.8):
+    - Use mktemp instead of tempfile (because Fedora does not have the tempfile
+      binary). (Fixes: #347).
+    - Replace makepasswd by pwgen (because Fedora does not have makepasswd).
+    - Improve parsing of the NX session.log file where unexpected extra logging
+      takes place during session suspension/resumption. Thanks to Gerald Richter
+      for finding this!!! (Fixes: #356).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 28 Nov 2013 16:14:32 +0100
 
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index e2a784a..4d1395b 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -69,7 +69,7 @@ sub is_suspended
 	my $sess=shift;
 	my $user=shift;
 	my $log="/tmp/.x2go-${user}/session-C-${sess}.log";
-	my $text=`tail -1 $log 2>/dev/null`;
+	my $text=`grep Session: $log 2>/dev/null|tail -1`;
 	if ($text =~ m/Session suspended/)
 	{
 		return 1;


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