x2goserver.git - build-baikal (branch) updated: 3.0.99-2-230-g6d4b1f0 - x2go-commits

3 Jan 2014

The branch, build-baikal has been updated
       via  6d4b1f0ea803d86b5f421de4047d334f69e63fe6 (commit)
      from  c4aa48e53727bf9da045908431008e7e63e683f9 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                            |    1 +
 x2goserver/bin/x2golistdesktops             |    6 ++++++
 x2goserver/bin/x2golistsessions             |    5 +++++
 x2goserver/bin/x2gomountdirs                |    2 ++
 x2goserver/bin/x2goprint                    |    2 ++
 x2goserver/bin/x2goresume-session           |    2 ++
 x2goserver/bin/x2goruncommand               |    7 +++++--
 x2goserver/bin/x2gosessionlimit             |    2 ++
 x2goserver/bin/x2goshowblocks               |    2 ++
 x2goserver/bin/x2gostartagent               |    6 ++++--
 x2goserver/bin/x2gosuspend-session          |    2 ++
 x2goserver/bin/x2goterminate-session        |    2 ++
 x2goserver/bin/x2goumount-session           |    2 ++
 x2goserver/lib/x2gologlevel                 |    1 -
 x2goserver/lib/{x2gogetports => x2gosyslog} |   11 ++++++-----
 15 files changed, 43 insertions(+), 10 deletions(-)
 copy x2goserver/lib/{x2gogetports => x2gosyslog} (89%)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 669914c..7f597df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Initialize Syslog module for all Perl scripts in x2goserver package.
   * Add debugging support for almost all DB functions in x2godbwrapper.pm, fix
     for Syslog module initialization in all Perl scripts.
+  * Add info loglevel messages for all scripts in bin dir.
 
   [ Martin Oehler ]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops
index 9c235b4..33e7e05 100755
--- a/x2goserver/bin/x2golistdesktops
+++ b/x2goserver/bin/x2golistdesktops
@@ -31,6 +31,12 @@ openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
 
+if ( @ARGV ) {
+	syslog('info', "x2golistdesktops has been called with options: @ARGV");
+} else {
+	syslog('info', "x2golistdesktops has been called without options");
+}
+
 my $serv=shift;
 if( ! $serv)
 {
diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions
index 56d9e40..2a99327 100755
--- a/x2goserver/bin/x2golistsessions
+++ b/x2goserver/bin/x2golistsessions
@@ -31,6 +31,11 @@ use x2gologlevel;
 openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
+if ( @ARGV ) {
+	syslog('info', "x2golistsessions has been called with options: @ARGV");
+} else {
+	syslog('info', "x2golistsessions has been called with no option");
+}
 
 sub check_stat
 {
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 86b671d..3f94f6c 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -31,6 +31,8 @@ openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
 
+syslog('info', "x2golistmountdirs has been called with options: @ARGV");
+
 my $type=shift;
 my $session=shift;
 my $user=shift;
diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint
index 8d76ff0..88a4eaf 100755
--- a/x2goserver/bin/x2goprint
+++ b/x2goserver/bin/x2goprint
@@ -34,6 +34,8 @@ openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
 
+syslog('info', "x2goprint has been called with options: @ARGV");
+
 sub check_root
 {
 	my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<);
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 04b0e23..c41b314 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -35,6 +35,8 @@ X2GO_ROOT=${HOME}/.x2go
 X2GO_RESIZE=0
 X2GO_FULLSCREEN=0
 
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+
 if [ "$X2GO_GEOMETRY" == "" ]
 then
 	X2GO_GEOMETRY=fullscreen
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 50dcff7..6b038d9 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -26,6 +26,11 @@ X2GO_SESSION=$3
 cmd=$5
 sndsys=$6
 X2GO_SESS_TYPE=$7
+
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
+
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+
 export DISPLAY
 export X2GO_AGENT_PID
 export X2GO_SESSION
@@ -35,8 +40,6 @@ X2GO_ROOT=${HOME}/.x2go
 MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput
 echo "exec $cmd" >> $MESSAGE_FILE
 
-X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
-
 IMEXIT="false"
 
 if [ "$sndsys" == "esd" ]; then
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index 43e67b5..9022160 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -31,6 +31,8 @@ openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
 
+syslog('info', "x2gosessionlimit has been called");
+
 my $maxlimit=0;
 my $Config = new Config::Simple(syntax=>'ini');
 $Config->read('/etc/x2go/x2goserver.conf' );
diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks
index 7988fb1..2d29a55 100755
--- a/x2goserver/bin/x2goshowblocks
+++ b/x2goserver/bin/x2goshowblocks
@@ -31,6 +31,8 @@ openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
 
+syslog('info', "x2goshowblocks has been called with options: @ARGV");
+
 my $uname=shift;
 my $id=shift;
 my $tbl="mounts";
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 91d3e09..544a382 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -20,6 +20,10 @@
 # Copyright (C) 2007-2011  Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
+X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
+
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+
 X2GO_PORT=49 #First port for X2GO=50
 SSH_PORT=30000 #First ssh port 30001
 
@@ -38,8 +42,6 @@ X2GO_CMD=$9
 X2GO_RESIZE=0
 X2GO_FULLSCREEN=0
 
-X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
-
 if [ "$X2GO_STYPE" == "S" ]; then
 
 	SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'`
diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session
index c9b6656..490a276 100755
--- a/x2goserver/bin/x2gosuspend-session
+++ b/x2goserver/bin/x2gosuspend-session
@@ -28,6 +28,8 @@ fi
 
 X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
 
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+
 X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME` 
 X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
 
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index cbe4c38..eac5a4f 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -28,6 +28,8 @@ fi
 
 X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
 
+$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
+
 X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME` 
 X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
 
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 96b5d21..84b8342 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -32,6 +32,8 @@ openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
 
+syslog('info', "x2goumount-session has been called with options: @ARGV");
+
 my $session=shift;
 my $only_path=shift;
 my $uname=$ENV{'USER'};
diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel
index 970ea15..945f84e 100755
--- a/x2goserver/lib/x2gologlevel
+++ b/x2goserver/lib/x2gologlevel
@@ -21,7 +21,6 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
-use Config::Simple;
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2gologlevel;
diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gosyslog
similarity index 89%
copy from x2goserver/lib/x2gogetports
copy to x2goserver/lib/x2gosyslog
index 831c80a..a4d70d0 100755
--- a/x2goserver/lib/x2gogetports
+++ b/x2goserver/lib/x2gosyslog
@@ -24,14 +24,15 @@ use strict;
 use Sys::Syslog qw( :standard :macros );
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
 use x2gologlevel;
 
-openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
+my $component = shift;
+my $loglevel = shift;
+my $msg = "@ARGV";
 
-my $host=shift or die;
+openlog($component,'cons','user');
+syslog($loglevel, $msg);
+closelog;
 
-my $ports = join("\n", db_getports($host));
-print $ports;


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).

    