[X2go-Dev] x2goserver patch (against a pull from Sep 14, 2011)

[Ivan Kabaivanov]

--- x2goserver-git-2011-09-14/x2goserver/bin/x2gosuspend-session.original
2011-09-20 00:57:03.000000000 +0300
+++ x2goserver-git-2011-09-14/x2goserver/bin/x2gosuspend-session        
2011-09-
20 01:07:15.000000000 +0300
@@ -35,16 +35,15 @@
 
 
 #workaround for knotify
-killall -HUP knotify
+killall -HUP knotify > /dev/null 2>&1
 
 $X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME  > /dev/null
 
-kill -HUP $X2GO_AGENT_PID &>/dev/null && {
+kill -HUP $X2GO_AGENT_PID &>/dev/null &&
        $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME 
h
as successfully been suspended" || {
-} || {
        err_msg="ERROR: failed to suspend session with ID $SESSION_NAME"
-       echo err_$msg 1>&2
-       $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg"B
+       echo "$err_msg" 1>&2
+       $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg"
 }
 
 export HOSTNAME 
--- x2goserver-git-2011-09-14/x2goserver/bin/x2goresume-session.original
2011-09-20 01:03:40.000000000 +0300
+++ x2goserver-git-2011-09-14/x2goserver/bin/x2goresume-session 2011-09-20 
01:04
:00.000000000 +0300
@@ -85,8 +85,7 @@
 
 kill -HUP $X2GO_AGENT_PID &>/dev/null && \
        $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT 
successfull
y resumed session with ID $SESSION_NAME" || {
-} || {
        err_msg="ERROR: failed to resume session with ID $SESSION_NAME"
-       echo err_$msg 1>&2
+       echo "$err_msg" 1>&2
        $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg"
 }
--- x2goserver-git-2011-09-14/x2goserver/bin/x2goterminate-session.original
2011-09-20 00:50:57.000000000 +0300
+++ x2goserver-git-2011-09-14/x2goserver/bin/x2goterminate-session      
2011-09-
20 00:51:19.000000000 +0300
@@ -37,9 +37,8 @@
 
 kill -TERM $X2GO_AGENT_PID &>/dev/null && \
        $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME 
h
as successfully been terminated" || {
-} || {
        err_msg="ERROR: failed to terminate session with ID $SESSION_NAME"
-       echo "err_$msg" 1>&2
+       echo "$err_msg" 1>&2
        $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg"
 }
 


IvanK.