x2goserver.git - master (branch) updated: 3.0.99-2-221-g79bb217 - x2go-commits

9 Sep 2011

The branch, master has been updated
       via  79bb217bd5b5ee6775607c75f91241613ed3cbdb (commit)
       via  596b66be5553398cd282ec296f2eca629c4373a6 (commit)
      from  7f7ec2c82959950ef5ef2186b2c2ff658f8508ca (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 -----------------------------------------------------------------
commit 79bb217bd5b5ee6775607c75f91241613ed3cbdb
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Sep 9 13:56:20 2011 +0200

    x2gologlevel delivers int (instead of str) so that Perl scripts can handle it immediately

commit 596b66be5553398cd282ec296f2eca629c4373a6
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Sep 9 12:50:45 2011 +0200

    Add script lib/x2gologlevel: introduce [log] section in x2goserver.conf with only parameter ,,loglevel''.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 +
 x2goserver/etc/x2goserver.conf                     |    4 +++
 x2goserver/lib/{x2gocreatesession => x2gologlevel} |   25 ++++++++++++--------
 3 files changed, 21 insertions(+), 10 deletions(-)
 copy x2goserver/lib/{x2gocreatesession => x2gologlevel} (56%)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 87b6158..4356498 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     INSTALL howto.
   * Add sanity checks to x2goprint, script can only be run as root.
   * Fix x2goprint, add syslogging, add inline comments.
+  * Add script lib/x2gologlevel: introduce [log] section in x2goserver.conf
+    with only parameter ,,loglevel''.
 
   [ Martin Oehler ]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/etc/x2goserver.conf b/x2goserver/etc/x2goserver.conf
index af1e1b6..3a91293 100644
--- a/x2goserver/etc/x2goserver.conf
+++ b/x2goserver/etc/x2goserver.conf
@@ -3,3 +3,7 @@
 
 [limit groups]
 #x2gousers=1
+
+[log]
+# possible levels are: err, warn, notice, info, debug
+loglevel=notice
diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gologlevel
similarity index 56%
copy from x2goserver/lib/x2gocreatesession
copy to x2goserver/lib/x2gologlevel
index 425a5d0..0648f96 100755
--- a/x2goserver/lib/x2gocreatesession
+++ b/x2goserver/lib/x2gologlevel
@@ -21,17 +21,22 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de>
 
 use strict;
+use Config::Simple;
+use Sys::Syslog qw( :standard :macros );
 
-use lib `echo -n \$(x2gobasepath)/lib/x2go`;
-use x2godbwrapper; 
+my $Config = new Config::Simple(syntax=>'ini');
+$Config->read('/etc/x2go/x2goserver.conf' );
 
+my $strloglevel = $Config->param("log.loglevel");
 
-my $cookie=shift or die;
-my $pid=shift or die;
-my $client=shift or die;
-my $gr_port=shift or die;
-my $snd_port=shift or die;
-my $fs_port=shift or die;
-my $sid=shift or die;
+my $loglevel = LOG_NOTICE;
+if    ( $strloglevel eq "emerg" )  { $loglevel = LOG_EMERG; }
+elsif ( $strloglevel eq "alert" )  { $loglevel = LOG_ALERT; }
+elsif ( $strloglevel eq "crit" )   { $loglevel = LOG_CRIT; }
+elsif ( $strloglevel eq "err" )    { $loglevel = LOG_ERR; }
+elsif ( $strloglevel eq "warn" )   { $loglevel = LOG_WARNING; }
+elsif ( $strloglevel eq "notice" ) { $loglevel = LOG_NOTICE; }
+elsif ( $strloglevel eq "info" )   { $loglevel = LOG_INFO; }
+elsif ( $strloglevel eq "debug" )  { $loglevel = LOG_DEBUG; }
 
-db_createsession($cookie,$pid,$client,$gr_port, $snd_port, $fs_port, $sid);
+print "$loglevel";


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

    