cups-x2go.git - master (branch) updated: 3.0.0.2-24-g8599d98 - x2go-commits

9 Sep 2011

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

    Add loglevel config option, allow different log levels (i.e. levels of syslog verbosity).

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

Summary of changes:
 cups-x2go        |   47 ++++++++++++++++++++++++++++++++++++++++++-----
 cups-x2go.conf   |    2 ++
 debian/changelog |    2 ++
 3 files changed, 46 insertions(+), 5 deletions(-)

The diff of changes is:

diff --git a/cups-x2go b/cups-x2go
index d9bf5f5..ad2c436 100755
--- a/cups-x2go
+++ b/cups-x2go
@@ -42,6 +42,9 @@ my $printdsa = "/root/.ssh/id_dsa-x2goprint";
 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 \"%s\"";
 #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';
+
 # override hardcoded settings via config file
 my $cfgfile="/etc/cups/cups-x2go.conf";
 
@@ -77,12 +80,46 @@ sub readconfig
 				{
 					$ps2pdf=$value;
 				}
+				if($option eq "loglevel")
+				{
+					$strloglevel=$value;
+				}
 			}
 		close(CFG);
 	}
 }
 
 
+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 ) );
+}
+
 sub getsessions
 {
 	my $sesslist;
@@ -113,7 +150,6 @@ sub printfile
 		copy($tfile, "$spfile.title");
 		chown $uid,$gid,"$spfile";
 		chown $uid,$gid,"$spfile.title";
-		syslog('debug', `ls /var/spool/x2goprint`);
 		# log that we are about to process a print job
 		syslog('debug', "x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title");
 
@@ -140,13 +176,16 @@ sub printfile
 
 ### main ###
 
-my $uname=$ENV{USER};
 if (!$ARGV[0])
 {
 	print "file cups-x2go:/ \"Virtual X2GO Printer\" \"CUPS-X2GO\" \"MFG:Generic;MDL:CUPS-X2GO Printer;DES:Generic CUPS-X2GO Printer;CLS:PRINTER;CMD:POSTSCRIPT;\"\n";
 	exit 0;
 }
 
+# read config file before we go on...
+readconfig();
+setmylogmask();
+
 if (scalar(@ARGV) < 5 || scalar(@ARGV) > 6)
 {
 	print STDERR "ERROR: Usage: cups-x2go job-id user title copies options [file]\n";
@@ -160,7 +199,7 @@ my $printOptions;
 my $psFile;
 
 ($jobID, $userName, $jobTitle, $copies, $printOptions, $psFile) =  @ARGV;
-syslog('info', "Print job received from cups -> $jobID $userName $jobTitle $copies $printOptions $psFile");
+syslog('notice', "Print job received from cups -> $jobID $userName $jobTitle $copies $printOptions $psFile");
 
 my $tempFile;
 if (!$psFile)
@@ -181,8 +220,6 @@ if (!$psFile)
 	$psFile = $tempFile;
 }
 
-readconfig();
-
 # converting PS file that we retrieved from CUPS into PDF format
 $ps2pdf=~s/%s/$psFile/g;
 syslog('info', "Converting printjob with command: $ps2pdf\n");
diff --git a/cups-x2go.conf b/cups-x2go.conf
index f238e2a..6c7bf28 100644
--- a/cups-x2go.conf
+++ b/cups-x2go.conf
@@ -16,3 +16,5 @@
 ## command to generate PDF file
 #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 \"%s\"
 
+## loglevel for cups-x2go, possible values: err, warn, notice, info, debug
+# loglevel = notice
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index e732607..fa97eb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ cups-x2go (3.0.0.2-0~x2go2) UNRELEASED; urgency=low
   * Major change of code, add comments, syslogging, fix ghostscript call.
   * Fix remote printing, use host specified in X2go session information for
     destination of print jobs, not the host specified in cups-x2go.conf.
+  * Add loglevel config option, allow different log levels (i.e. levels of
+    syslog verbosity).
 
   [ Mario Oroz ]
   * Add syslog support for cups-x2go.


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

    