[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-263-g1c012ce

X2Go dev team git-admin at x2go.org
Sat Dec 7 23:20:23 CET 2013


The branch, master has been updated
       via  1c012ce3f85d9532da7775561a238f36d1a49d69 (commit)
      from  ff0d0346071b860a4df52c84701c0b069b0850f4 (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 1c012ce3f85d9532da7775561a238f36d1a49d69
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 74cb467..44999b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -215,9 +215,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 728ead3..7b8c731 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -72,7 +72,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).




More information about the x2go-commits mailing list