[X2Go-Commits] [x2goserver] 01/01: Fix wrong evocation of x2gosyslog ("error" -> "err").
git-admin at x2go.org
git-admin at x2go.org
Wed Feb 4 20:10:35 CET 2015
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 3510f01ca8b7fee4dede99d162fe95bb3aa728de
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Feb 4 20:10:13 2015 +0100
Fix wrong evocation of x2gosyslog ("error" -> "err").
---
debian/changelog | 1 +
x2goserver/bin/x2goresume-session | 6 +++---
x2goserver/bin/x2gostartagent | 12 ++++++------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 104e9be..ce84ef8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
that not only works on Debian, but also on Fedora et al. (Fixes: #727).
- Provide legacy support for old File::Path packages in x2godbadmin.
(Fixes: #715).
+ - Fix wrong evocation of x2gosyslog ("error" -> "err").
* debian/control:
+ Add D (x2goserver): libfile-which-perl.
+ Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2-0~). (Fixes: #700).
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index a2b9fbb..a90edc8 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -26,7 +26,7 @@ if [ $# -lt 7 ]
then
msg="not enough command line arguments"
echo "$msg"
- $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$msg"
exit -1
fi
SESSION_NAME="$1"
@@ -60,7 +60,7 @@ if [ "$STATE" == "TERMINATED" ] || [ "$STATE" == "TERMINATING" ]
then
msg="session $SESSION_NAME terminated"
echo "$msg"
- $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$msg"
exit -1
fi
@@ -98,7 +98,7 @@ do
then
msg="it is taking too long to suspend the session-to-be-resumed; it is possible that the session is in a damaged state"
echo "$msg"
- $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$msg"
exit -1;
fi
STATE=`$X2GO_LIB_PATH/x2gogetagentstate "$SESSION_NAME"`
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index be6da04..13e62f3 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -31,22 +31,22 @@ SSH_PORT=30000 #First ssh port 30001
if egrep "^backend[ ]*=[ ]*postgres" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null && [ "x$USER" = "xroot" ]; then
msg="The super-user \"root\" is not allowed to launch X2Go sessions."
echo "$msg"
- $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$msg"
exit -1
elif [ -z "$USER" ]; then
msg="The \$USER environment variable is not set. Aborting session startup."
echo "$msg"
- $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$msg"
exit -2
elif [ -z "$HOME" ]; then
msg="The \$HOME environment variable is not set. Aborting session startup."
echo "$msg"
- $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$msg"
exit -4
elif ! echo $HOME | iconv -f ASCII -t ASCII 1>/dev/null 2>/dev/null; then
msg="Your home directory path contains non-ASCII characters. Aborting session startup."
echo "$msg"
- $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$msg"
exit -5
fi
@@ -75,7 +75,7 @@ fi
if [ -z "$X2GO_CLIENT" ]; then
msg="The \$X2GO_CLIENT environment variable is not set. Possible reasons: \$SSH_CLIENT not set or \$SSH_CONNECTION not set. Or \$X2GO_CLIENT not set by ,,X2Go Desktop Sharing'' applet. Aborting session startup."
echo "$msg"
- $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$msg"
exit -3
fi
@@ -156,7 +156,7 @@ LWORD=`echo $LIMIT | awk '{print $1}'`
if [ "$LWORD" == "LIMIT" ]; then
echo $LIMIT 1>&2
- $X2GO_LIB_PATH/x2gosyslog "$0" "error" "session limit has been reached for user ,,$USER'', cannot start new session"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "err" "session limit has been reached for user ,,$USER'', cannot start new session"
exit -1
fi
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list