cups-x2go.git - master (branch) updated: 3.0.0.2-25-gd94e29d - x2go-commits

9 Sep 2011

The branch, master has been updated
       via  d94e29dcd1b5cf40aad6505b7a2d004b828b5554 (commit)
      from  8599d986f186442a9c9c150657bba930d1da2c6f (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 d94e29dcd1b5cf40aad6505b7a2d004b828b5554
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Sep 9 13:50:36 2011 +0200

    fix for setting syslog level

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

Summary of changes:
 cups-x2go |   45 ++++++++++++++-------------------------------
 1 files changed, 14 insertions(+), 31 deletions(-)

The diff of changes is:

diff --git a/cups-x2go b/cups-x2go
index ad2c436..061dcb4 100755
--- a/cups-x2go
+++ b/cups-x2go
@@ -18,13 +18,12 @@
 #  Free Software Foundation, Inc.,
 #  51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-use Sys::Syslog qw( :DEFAULT setlogsock);
+use Sys::Syslog qw( :standard :macros );
 use Sys::Hostname;
 use File::Basename;
 use File::Copy;
 use strict;
 
-setlogsock('unix');
 openlog($0,'cons,pid','user');
 
 ## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise
@@ -43,7 +42,7 @@ my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER
 #my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\"";
 
 ## loglevel for cups-x2go, possible values: err, warn, notice, info, debug
-my $strloglevel = 'notice';
+my $strloglevel = "notice";
 
 # override hardcoded settings via config file
 my $cfgfile="/etc/cups/cups-x2go.conf";
@@ -70,7 +69,7 @@ sub readconfig
 				if($option eq "x2goserver")
 				{
 					$x2goserver=$value;
-					$x2goserver=~s/ //g
+					$x2goserver=~s/ //g;
 				}
 				if($option eq "printdsa")
 				{
@@ -83,6 +82,7 @@ sub readconfig
 				if($option eq "loglevel")
 				{
 					$strloglevel=$value;
+					$strloglevel=~s/ //g;
 				}
 			}
 		close(CFG);
@@ -91,33 +91,16 @@ sub readconfig
 
 
 sub setmylogmask {
-	if ( $strloglevel == 'emerg' ) {
-		my $intloglevel = LOG_EMERG;
-	}
-	elsif ( $strloglevel == 'alert' ) {
-		my $intloglevel = LOG_ALERT;
-	}
-	elsif ( $strloglevel == 'crit' ) {
-		my $intloglevel = LOG_CRIT;
-	}
-	elsif ( $strloglevel == 'err' ) {
-		my $intloglevel = LOG_ERR;
-	}
-	elsif ( $strloglevel == 'warn' ) {
-		my $intloglevel = LOG_WARNING;
-	}
-	elsif ( $strloglevel == 'notice' ) {
-		my $intloglevel = LOG_NOTICE
-	}
-	elsif ( $strloglevel == 'info' {
-		my $intloglevel = LOG_INFO;
-	}
-	elsif ( $strloglevel == 'debug' ) {
-		my $intloglevel = LOG_DEBUG;
-	} else {
-		my $intloglevel = LOG_ERR;
-	}
-	setlogmask( LOG_UPTO( $intloglevel ) );
+	my $loglevel = LOG_ERR;
+	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; }
+	setlogmask( LOG_UPTO( $loglevel ) );
 }
 
 sub getsessions


hooks/post-receive
-- 
cups-x2go.git (CUPS Backend for X2go Printing)

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 "cups-x2go.git" (CUPS Backend for X2go Printing).

    