[X2Go-Commits] [x2goserver] 01/01: x2gocleansessions: Don't print to stderr if the session state file cannot be found. This can happen during session startups. Report to system log instead.

git-admin at x2go.org git-admin at x2go.org
Wed Aug 20 12:03:12 CEST 2014


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

x2go pushed a commit to branch master
in repository x2goserver.

commit f81f72e95a5bbbf95f4f079be264894925fd4abc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Aug 20 12:00:55 2014 +0200

    x2gocleansessions: Don't print to stderr if the session state file cannot be found. This can happen during session startups. Report to system log instead.
    
    Conflicts (resolved by Mike Gabriel):
    	x2goserver/sbin/x2gocleansessions
---
 X2Go/Server/Agent/NX.pm |    2 +-
 debian/changelog        |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/X2Go/Server/Agent/NX.pm b/X2Go/Server/Agent/NX.pm
index 187b25e..308eff0 100644
--- a/X2Go/Server/Agent/NX.pm
+++ b/X2Go/Server/Agent/NX.pm
@@ -84,7 +84,7 @@ sub get_agent_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/debian/changelog b/debian/changelog
index e9eb3db..a4fc7a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -199,6 +199,9 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low
       characters. (Fixes: #397).
     - Export XAUTHORITY env var in x2goruncommand to enable privilege upgrade
       for applications started via pkexec. (Fixes: #458).
+    - x2gocleansessions: Don't print to stderr if the session state file cannot
+      be found. This can happen during session startups. Report to system log
+      instead.
   * debian/control, x2goserver.spec:
     + Update versioned D: x2goagent (>= 3.5.0.25). This assures that X2Go
       works with poly-instantiated /tmp directories.

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


More information about the x2go-commits mailing list