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

X2Go dev team git-admin at x2go.org
Fri Jan 3 20:52:31 CET 2014


The branch, build-baikal has been updated
       via  d63a839c23b8f470aa30b32d3b37be66e2d412aa (commit)
      from  79bb217bd5b5ee6775607c75f91241613ed3cbdb (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/bin/x2goprint                         |    7 +++---
 x2goserver/lib/x2gologlevel                      |   19 +++-------------
 x2goserver/lib/{x2gologlevel => x2gologlevel.pm} |   26 +++++++++++++---------
 4 files changed, 25 insertions(+), 29 deletions(-)
 copy x2goserver/lib/{x2gologlevel => x2gologlevel.pm} (65%)
 mode change 100755 => 100644

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4356498..f4efee2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Fix x2goprint, add syslogging, add inline comments.
   * Add script lib/x2gologlevel: introduce [log] section in x2goserver.conf
     with only parameter ,,loglevel''.
+  * Change x2gologlevel script into a Perl module (and a script that calls it).
+    Using x2gologlevel function in x2goprint to set loglevel mask.
 
   [ Martin Oehler ]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint
index 8d0da56..cfe08b9 100755
--- a/x2goserver/bin/x2goprint
+++ b/x2goserver/bin/x2goprint
@@ -23,14 +23,15 @@
 use File::Basename;
 use File::Copy;
 use File::Path;
-use Sys::Syslog qw( :DEFAULT setlogsock);
+use Sys::Syslog qw( :DEFAULT );
 use strict;
 
 use lib `echo -n \$(x2gobasepath)/lib/x2go`;
 use x2godbwrapper;
+use x2gologlevel;
 
-setlogsock('unix');
 openlog($0,'cons,pid','user');
+setlogmask( LOG_UPTO(x2gologlevel()) );
 
 sub check_root
 {
@@ -81,7 +82,7 @@ if( -e "$printdir/$titleFile")
 	close (TITLE);
 	unlink("$printdir/$titleFile");
 }
-syslog('info', "x2goprint is processing $printdir/$pdfFile with print job title ,,$title\''");
+syslog('notice', "x2goprint is processing $printdir/$pdfFile with print job title ,,$title\''");
 
 # temp location for placing incoming spool files, so that
 # they can can be picked by the session user and further processed
diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel
index 0648f96..970ea15 100755
--- a/x2goserver/lib/x2gologlevel
+++ b/x2goserver/lib/x2gologlevel
@@ -22,21 +22,8 @@
 
 use strict;
 use Config::Simple;
-use Sys::Syslog qw( :standard :macros );
 
-my $Config = new Config::Simple(syntax=>'ini');
-$Config->read('/etc/x2go/x2goserver.conf' );
+use lib `echo -n \$(x2gobasepath)/lib/x2go`;
+use x2gologlevel;
 
-my $strloglevel = $Config->param("log.loglevel");
-
-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; }
-
-print "$loglevel";
+print x2gologlevel();
diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel.pm
old mode 100755
new mode 100644
similarity index 65%
copy from x2goserver/lib/x2gologlevel
copy to x2goserver/lib/x2gologlevel.pm
index 0648f96..3d904e2
--- a/x2goserver/lib/x2gologlevel
+++ b/x2goserver/lib/x2gologlevel.pm
@@ -24,19 +24,25 @@ use strict;
 use Config::Simple;
 use Sys::Syslog qw( :standard :macros );
 
+use base 'Exporter';
+our @EXPORT = ( 'x2gologlevel' );
+
 my $Config = new Config::Simple(syntax=>'ini');
 $Config->read('/etc/x2go/x2goserver.conf' );
 
 my $strloglevel = $Config->param("log.loglevel");
 
-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; }
+sub x2gologlevel {
+	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; }
+	return $loglevel;
+}
 
-print "$loglevel";
+1;
\ No newline at end of file


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




More information about the x2go-commits mailing list