rpms/mysql-mmm/devel mmm_mon_log.conf, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 mysql-mmm.spec, 1.1, 1.2 sources, 1.2, 1.3 mysql-mmm-2.0.10-lp473446.patch, 1.1, NONE

[derks]

Author: derks

Update of /cvs/pkgs/rpms/mysql-mmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19499/devel

Modified Files:
	.cvsignore import.log mysql-mmm.spec sources 
Added Files:
	mmm_mon_log.conf 
Removed Files:
	mysql-mmm-2.0.10-lp473446.patch 
Log Message:
2.0.11 upstream source update


--- NEW FILE mmm_mon_log.conf ---
#log4perl.logger = FATAL, MMMLog, MailFatal
log4perl.logger = FATAL, MMMLog

log4perl.appender.MMMLog = Log::Log4perl::Appender::File
log4perl.appender.MMMLog.Threshold = INFO
log4perl.appender.MMMLog.filename = /var/log/mysql-mmm/mmmd_mon.log
log4perl.appender.MMMLog.recreate = 1
log4perl.appender.MMMLog.layout = PatternLayout
log4perl.appender.MMMLog.layout.ConversionPattern = %d %5p %m%n

#
# Uncomment and edit the following to send FATAL messages via email.  Must
# also add MailFatal to the logger (first line up top).
#
#log4perl.appender.MailFatal = Log::Dispatch::Email::MailSender
#log4perl.appender.MailFatal.Threshold = FATAL
#log4perl.appender.MailFatal.from = mmm at example.com
#log4perl.appender.MailFatal.to = root
#log4perl.appender.MailFatal.buffered = 0
#log4perl.appender.MailFatal.subject = FATAL error in mysql-mmm-monitor
#log4perl.appender.MailFatal.layout = PatternLayout
#log4perl.appender.MailFatal.layout.ConversionPattern = %d %m%n


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Dec 2009 19:44:24 -0000	1.2
+++ .cvsignore	11 Feb 2010 01:05:42 -0000	1.3
@@ -1,2 +1,2 @@
-mysql-mmm-2.0.10-1.pdf
-mysql-mmm-2.0.10.tar.gz
+mysql-mmm-2.0.11-1.pdf
+mysql-mmm-2.0.11.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Dec 2009 19:44:24 -0000	1.1
+++ import.log	11 Feb 2010 01:05:42 -0000	1.2
@@ -1 +1,2 @@
 mysql-mmm-2_0_10-4:HEAD:mysql-mmm-2.0.10-4.src.rpm:1260819829
+mysql-mmm-2_0_11-1:HEAD:mysql-mmm-2.0.11-1.src.rpm:1265850312


Index: mysql-mmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/mysql-mmm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-mmm.spec	14 Dec 2009 19:44:24 -0000	1.1
+++ mysql-mmm.spec	11 Feb 2010 01:05:42 -0000	1.2
@@ -1,7 +1,7 @@
 
 Name: mysql-mmm
-Version: 2.0.10 
-Release: 4%{?dist}
+Version: 2.0.11 
+Release: 1%{?dist}
 Summary: Multi-Master Replication Manager for MySQL
 License: GPLv2
 URL: http://mysql-mmm.org
@@ -11,6 +11,7 @@ Source1: mysql-mmm.logrotate
 Source2: http://mysql-mmm.org/_media/:mmm2:/%{name}-%{version}-1.pdf
 Source3: mysql-mmm-agent.init
 Source4: mysql-mmm-monitor.init
+Source5: mmm_mon_log.conf 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
 BuildArch: noarch
 Provides: mmm = %{version}-%{release} 
@@ -18,7 +19,6 @@ Provides: mysql-master-master = %{versio
 
 Patch0: mysql-mmm-2.0.9-paths.patch
 Patch1: mysql-mmm-2.0.9-configs.patch 
-Patch3: mysql-mmm-2.0.10-lp473446.patch
 Patch4: mysql-mmm-2.0.10-default_logging.patch
 
 %description
@@ -80,7 +80,6 @@ EOF
 
 %patch0 -p1 
 %patch1 -p1
-%patch3 -p1
 %patch4 -p1
 
 
@@ -100,13 +99,15 @@ make install DESTDIR=%{buildroot}
 
 install -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm
 
-# place our init scripts
+# Replace our init scripts
 %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
 %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor
 
 install -m 0755 %SOURCE3 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
 install -m 0755 %SOURCE4 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor
 
+# Additional logs
+install -m 0640 %SOURCE5 %{buildroot}%{_sysconfdir}/%{name}/mmm_mon_log.conf
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -176,6 +177,7 @@ fi
 %defattr(-,root,root,-)
 %doc README
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon.conf
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon_log.conf
 %attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-monitor
 %{perl_vendorlib}/MMM/Monitor
 %{_libexecdir}/mysql-mmm/monitor/
@@ -184,6 +186,11 @@ fi
 
 
 %changelog
+* Mon Feb 08 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.0.11-1
+- Latest sources from upstream
+- Removed Patch3: mysql-mmm-2.0.10-lp473446.patch (appied upstream)
+- Added default mmm_mon_log.conf to allow logger modification
+
 * Fri Dec 04 2009 BJ Dierkes <wdierkes at rackspace.com> - 2.0.10-4
 - Add auto_set_online to 60 in mmm_mon.conf
 - Provides full version-release for all subpackages


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Dec 2009 19:44:24 -0000	1.2
+++ sources	11 Feb 2010 01:05:42 -0000	1.3
@@ -1,2 +1,2 @@
-822a0d8819af1bcf6fb228f0ecfd3ed4  mysql-mmm-2.0.10-1.pdf
-e8b8df923eeeeae9c4f8ec5584f5023d  mysql-mmm-2.0.10.tar.gz
+c79ef290d1a8e7560128269fa1cf8cfa  mysql-mmm-2.0.11-1.pdf
+5498c66238bf33863d725900435c8e9c  mysql-mmm-2.0.11.tar.gz


--- mysql-mmm-2.0.10-lp473446.patch DELETED ---