[MySQL-zrm: 1/2] Add quiet patch to really silence messages

[Orion Poplawski]

commit 22f4584ab8743d43f39701645e106cc627e1958a
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed May 18 16:52:55 2011 -0600

    Add quiet patch to really silence messages

 MySQL-zrm-2.2.0-quiet.patch |  103 +++++++++++++++++++++++++++++++++++++++++++
 MySQL-zrm.spec              |    4 +-
 2 files changed, 106 insertions(+), 1 deletions(-)
---
diff --git a/MySQL-zrm-2.2.0-quiet.patch b/MySQL-zrm-2.2.0-quiet.patch
new file mode 100644
index 0000000..6c8a9ec
--- /dev/null
+++ b/MySQL-zrm-2.2.0-quiet.patch
@@ -0,0 +1,103 @@
+diff -up MySQL-zrm-2.2.0/usr/bin/mysql-zrm-scheduler.quiet MySQL-zrm-2.2.0/usr/bin/mysql-zrm-scheduler
+--- MySQL-zrm-2.2.0/usr/bin/mysql-zrm-scheduler.quiet	2010-02-03 17:19:25.000000000 -0700
++++ MySQL-zrm-2.2.0/usr/bin/mysql-zrm-scheduler	2010-09-22 10:33:40.557593095 -0600
+@@ -195,7 +195,12 @@ unless ( -d $logdir ) {
+ }
+ 
+ open (LOG, ">>$logfile") || &log_and_die ("ERROR: Cannot create/open logfile: $!\n");
+-print STDOUT "Logging to $logfile\n";
++my $quiet="";
++if( !defined $inputs{"quiet"} || $inputs{"quiet"} == 0 ){
++    print STDOUT "Logging to $logfile\n";
++} else {
++    $quiet="--quiet";
++}
+ 
+ 
+ unless ( defined $delete || defined $add || defined $query || defined $now) {
+@@ -238,14 +243,16 @@ if ( defined $interval && $interval eq "
+ #now is specified, just start mysql-zrm
+ #Not doing anything with crontab.
+ if ( $now ) {
+-    system ("$zrm_backup $verbose $level_str --backup-set $backupset");
++    system ("$zrm_backup $verbose $level_str --backup-set $backupset $quiet");
+     $exit_value  = $? >> 8;
+     if ( $exit_value !=0 ) {
+ 	&mprint ("ERROR: $zrm did not finish successfully\n");
+ 	&call_reporter($backupset);
+ 	exit 1;
+     } else {
+-	&mprint ("$zrm started successfully\n");
++	if( !defined $inputs{"quiet"} || $inputs{"quiet"} == 0 ){
++	    &mprint ("$zrm started successfully\n");
++	}
+ 	&call_reporter($backupset);
+ 	exit;
+     }
+diff -up MySQL-zrm-2.2.0/usr/bin/zrm-pre-scheduler.quiet MySQL-zrm-2.2.0/usr/bin/zrm-pre-scheduler
+--- MySQL-zrm-2.2.0/usr/bin/zrm-pre-scheduler.quiet	2010-02-03 17:19:25.000000000 -0700
++++ MySQL-zrm-2.2.0/usr/bin/zrm-pre-scheduler	2010-09-22 10:08:30.634655783 -0600
+@@ -229,10 +229,6 @@ unless ( -d $logdir ) {
+     die ("ERROR: mkdir $logdir failed: $!\n");
+ }
+ 
+-open (LOG, ">>$logfile") || &log_and_die ("ERROR: Cannot create/open logfile: $!\n");
+-print STDOUT "Logging to $logfile\n";
+-
+-
+ my $ret;
+ my $now="--now";
+ my $no_plugin=0;
+@@ -240,6 +236,15 @@ my $exit_value=0;
+ my $skip=0;
+ my $level=0;
+ my $delay=0;
++my $quiet="";
++
++
++open (LOG, ">>$logfile") || &log_and_die ("ERROR: Cannot create/open logfile: $!\n");
++if( !defined $inputs{"quiet"} || $inputs{"quiet"} == 0 ){
++    print STDOUT "Logging to $logfile\n";
++} else {
++    $quiet = "--quiet";
++}
+ 
+ 
+ my $interval    = $inputs{"interval"};
+@@ -290,7 +295,7 @@ if ( $skip ||
+ if ( $no_plugin == 1 || $exit_value == 0 ||
+      (($interval ne "daily") &&  ($delay + $exit_value) > 23 )) {
+     # call mysql-zrm-scheduler --now
+-    system($zrm_scheduler, $now, "--backup-set", $backupset, "--interval", $interval, "--backup-level", $level);
++    system($zrm_scheduler, $now, "--backup-set", $backupset, "--interval", $interval, "--backup-level", $level, $quiet);
+     &mprint("ERROR: $zrm_scheduler failed\n") if ( $? == 1 );
+     &call_reporter($backupset);
+ 
+diff -up MySQL-zrm-2.2.0/usr/lib/mysql-zrm/ZRM/Common.pm.quiet MySQL-zrm-2.2.0/usr/lib/mysql-zrm/ZRM/Common.pm
+--- MySQL-zrm-2.2.0/usr/lib/mysql-zrm/ZRM/Common.pm.quiet	2010-02-03 17:19:25.000000000 -0700
++++ MySQL-zrm-2.2.0/usr/lib/mysql-zrm/ZRM/Common.pm	2010-09-22 10:08:30.636591091 -0600
+@@ -1458,6 +1458,9 @@ sub verifySnapshotParams()
+ 	}
+ 	my $cmd = $inputs{"snapshot-plugin"};
+         $cmd .= " --action verify-config";
++	if( defined $inputs{"quiet"} && $inputs{"quiet"} == 1 ){
++		$cmd .= " --quiet";
++	}
+ 	$cmd .= " 2>$LOGGER";
+         if( $verbose ){
+                 &printLog( "Running snapshot verification using command $cmd\n" );
+@@ -1475,13 +1478,13 @@ sub verifySnapshotParams()
+ # @_ list of acceptable command line paramneters
+ sub initCommon()
+ {
+-        &getZrmVersion();
+         &openLogFile();
+ 	&notifyMonitor($action."_ZRM_STARTED");
+         if( $verbose ){
+                 &printLog( "action being performed is ".$action."\n" );
+         }
+         &processCommandLineParams(@_);
++        &getZrmVersion();
+         &processOptionFiles();
+ 	&processTmpDir();
+ 	&processDirPaths();
diff --git a/MySQL-zrm.spec b/MySQL-zrm.spec
index e8e4e01..056260e 100644
--- a/MySQL-zrm.spec
+++ b/MySQL-zrm.spec
@@ -1,6 +1,6 @@
 Name:		MySQL-zrm
 Version:	2.2.0
-Release:	1%{?dist}
+Release:	1%{?dist}.cora.1
 Summary:	MySQL backup manager
 
 Group:		Applications/System
@@ -8,6 +8,7 @@ License:	GPLv2
 URL:		http://www.zmanda.com/backup-mysql.html
 source0:	http://www.zmanda.com/downloads/community/ZRM-MySQL/2.2/Source/MySQL-zrm-%{version}.tar.gz
 Patch0:		MySQL-zrm-disable-xinetd-service.patch
+Patch1:		MySQL-zrm-2.2.0-quiet.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
@@ -28,6 +29,7 @@ server.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .quiet
 
 %build
 # we should use modules from repo