[X2Go-Commits] [x2goserver] 02/02: Fix breakage of X2Go Server when upgrading from 4.0.1.15 while sessions are still in running / suspended state. (Fixes: #623).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit a13accdd301d8096f95431dfc778cbb3e01d1926
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 2 12:20:56 2014 +0200

     Fix breakage of X2Go Server when upgrading from 4.0.1.15 while sessions are still in running / suspended state. (Fixes: #623).
---
 debian/changelog                      |    4 +++-
 x2goserver/bin/x2golistsessions       |    2 +-
 x2goserver/sbin/x2gocleansessions     |    2 +-
 x2goserver/sbin/x2golistsessions_root |    2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc2d800..882863a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 x2goserver (4.0.1.17-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development...
+  * New upstream release (4.0.1.17):
+    - Fix breakage of X2Go Server when upgrading from 4.0.1.15 while
+      sessions are still in running / suspended state. (Fixes: #623).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 02 Oct 2014 12:18:58 +0200
 
diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions
index 8e0ea0a..dc78ec3 100755
--- a/x2goserver/bin/x2golistsessions
+++ b/x2goserver/bin/x2golistsessions
@@ -74,7 +74,7 @@ sub get_agent_state
 	my $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state";
 	if (! -e $stateFile )
 	{
-		print { \*STDERR } "WARNING: state file for session $sess does not exists: $stateFile\n";
+		syslog('warning', "$sess: state file for this session does not exists: $stateFile (this can be ignored during session startups)");
 		$state="UNKNOWN";
 	}
 	else
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index 0f8b283..56dcbbd 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -93,7 +93,7 @@ sub get_agent_state
 	my $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state";
 	if (! -e $stateFile )
 	{
-		syslog('warning', "$sess: state file for this session does not exists: $stateFile (this can be ignored during session startups)");
+		syslog('warning', "$sess: state file for this session does not exist: $stateFile (this can be ignored during session startups)");
 		$state = "UNKNOWN";
 	}
 	else
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index 3b3e477..d562fa3 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -49,7 +49,7 @@ sub get_agent_state
 	my $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state";
 	if (! -e $stateFile )
 	{
-		print { \*STDERR } "WARNING: state file for session $sess does not exists: $stateFile\n";
+		syslog('warning', "$sess: state file for this session does not exist: $stateFile (this can be ignored during session startups)");
 		$state="UNKNOWN";
 	}
 	else

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git