[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-220-g596b66b

[X2Go dev team]

The branch, build-baikal has been updated
       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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 ++
 x2goserver/etc/x2goserver.conf                     |    4 ++++
 .../x2goterminate => x2goserver/lib/x2gologlevel   |   13 +++++++++----
 3 files changed, 15 insertions(+), 4 deletions(-)
 copy x2goserver-compat/bin/x2goterminate => x2goserver/lib/x2gologlevel (81%)

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-compat/bin/x2goterminate b/x2goserver/lib/x2gologlevel
similarity index 81%
copy from x2goserver-compat/bin/x2goterminate
copy to x2goserver/lib/x2gologlevel
index 125d228..1144766 100755
--- a/x2goserver-compat/bin/x2goterminate
+++ b/x2goserver/lib/x2gologlevel
@@ -21,10 +21,15 @@
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
 
 use strict;
-my $proc=shift;
+use Config::Simple;
 
-my @outp=split(",","$proc");
-for(my $i=0;$i<@outp;$i++)
+my $Config = new Config::Simple(syntax=>'ini');
+$Config->read('/etc/x2go/x2goserver.conf' );
+
+my $loglevel = $Config->param("log.loglevel");
+if ($loglevel eq "")
 {
-    system("kill @outp[$i]");
+	$loglevel = 'info'
 }
+
+print "$loglevel\n";


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