rpms/mysql-mmm/devel import.log, 1.6, 1.7 mysql-mmm-agent.init, 1.2, 1.3 mysql-mmm-monitor.init, 1.2, 1.3 mysql-mmm.spec, 1.5, 1.6
derks
derks at fedoraproject.org
Thu Feb 25 17:47:19 UTC 2010
Author: derks
Update of /cvs/pkgs/rpms/mysql-mmm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21819/devel
Modified Files:
import.log mysql-mmm-agent.init mysql-mmm-monitor.init
mysql-mmm.spec
Log Message:
* Thu Feb 25 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-3
- Fixed init scripts to check for ENABLED only within the start
function.
* Tue Feb 23 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-2
- Added defaults file for mysql-mmm-agent and mysql-mmm-monitor
- Init scripts exit if ENABLED != 1
- Fixed typo in mysql-mmm-monitor where mmmd_mon was still referenced
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log 23 Feb 2010 03:51:58 -0000 1.6
+++ import.log 25 Feb 2010 17:47:18 -0000 1.7
@@ -4,3 +4,4 @@ mysql-mmm-2_0_11-1:HEAD:mysql-mmm-2.0.11
mysql-mmm-2_0_11-2:HEAD:mysql-mmm-2.0.11-2.src.rpm:1266441284
mysql-mmm-2_1_0-1:HEAD:mysql-mmm-2.1.0-1.src.rpm:1266882781
mysql-mmm-2_1_0-1_1:HEAD:mysql-mmm-2.1.0-1.1.src.rpm:1266897069
+mysql-mmm-2_1_0-3:HEAD:mysql-mmm-2.1.0-3.src.rpm:1267120022
Index: mysql-mmm-agent.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/mysql-mmm-agent.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mysql-mmm-agent.init 23 Feb 2010 03:51:59 -0000 1.2
+++ mysql-mmm-agent.init 25 Feb 2010 17:47:18 -0000 1.3
@@ -5,12 +5,13 @@
#
# chkconfig: - 64 36
# description: MMM Agent.
-# processname: mmmd_agent
+# processname: mmm_agentd
# config: /etc/mysql-mmm/mmm_agent.conf
# pidfile: /var/run/mysql-mmm/mmm_agentd.pid
-# Source function library.
+# Source function library and defaults file.
. /etc/rc.d/init.d/functions
+. /etc/default/mysql-mmm-agent
# Paths
MMMD_AGENT_BIN="/usr/sbin/mmm_agentd"
@@ -18,7 +19,13 @@ MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/m
LOCKFILE='/var/lock/subsys/mysql-mmm-agent'
prog='MMM Agent Daemon'
+
start() {
+ if [ "${ENABLED}" != "1" ]; then
+ echo "$prog is disabled!"
+ exit 1
+ fi
+
echo -n "Starting $prog: "
if [ -s $MMMD_AGENT_PIDFILE ] && kill -0 `cat $MMMD_AGENT_PIDFILE` 2> /dev/null; then
echo " already running."
Index: mysql-mmm-monitor.init
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/mysql-mmm-monitor.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mysql-mmm-monitor.init 23 Feb 2010 03:51:59 -0000 1.2
+++ mysql-mmm-monitor.init 25 Feb 2010 17:47:18 -0000 1.3
@@ -5,12 +5,13 @@
#
# chkconfig: - 64 36
# description: MMM Monitor.
-# processname: mmmd_mon
+# processname: mmm_mond
# config: /etc/mysql-mmm/mmm_mon.conf
# pidfile: /var/run/mysql-mmm/mmm_mond.pid
-# Source function library.
+# Source function library and defaults file.
. /etc/rc.d/init.d/functions
+. /etc/default/mysql-mmm-monitor
# Cluster name (it can be empty for default cases)
CLUSTER=''
@@ -18,15 +19,18 @@ LOCKFILE='/var/lock/subsys/mysql-mmm-mon
prog='MMM Monitor Daemon'
if [ "$CLUSTER" != "" ]; then
- MMMD_MON_BIN="/usr/sbin/mmm_mond @$CLUSTER"
- MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond-$CLUSTER.pid"
+ MMMD_MON_BIN="/usr/sbin/mmm_mond @$CLUSTER"
+ MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond-$CLUSTER.pid"
else
- MMMD_MON_BIN="/usr/sbin/mmmd_mon"
- MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond.pid"
+ MMMD_MON_BIN="/usr/sbin/mmm_mond"
+ MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond.pid"
fi
-
start() {
+ if [ "${ENABLED}" != "1" ]; then
+ echo "$prog is disabled!"
+ exit 1
+ fi
echo -n "Starting $prog: "
if [ -s $MMMD_MON_PIDFILE ] && kill -0 `cat $MMMD_MON_PIDFILE` 2> /dev/null; then
echo " already running."
@@ -35,7 +39,7 @@ start() {
daemon $MMMD_MON_BIN
RETVAL=$?
echo
- [ $RETVAL = 0 ] && touch $LOCKFILE
+ [ $RETVAL = 0 ] && touch $LOCKFILE
return $RETVAL
}
Index: mysql-mmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-mmm/devel/mysql-mmm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mysql-mmm.spec 23 Feb 2010 03:51:59 -0000 1.5
+++ mysql-mmm.spec 25 Feb 2010 17:47:18 -0000 1.6
@@ -1,7 +1,7 @@
Name: mysql-mmm
Version: 2.1.0
-Release: 1.1%{?dist}
+Release: 3%{?dist}
Summary: Multi-Master Replication Manager for MySQL
License: GPLv2
URL: http://mysql-mmm.org
@@ -16,6 +16,7 @@ Source6: mmm_agent.conf
Source7: mmm_mon.conf
Source8: mmm_tools.conf
Source9: mmm_common.conf
+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Provides: mmm = %{version}-%{release}
@@ -117,6 +118,19 @@ install -m 0640 %SOURCE9 %{buildroot}%{_
install -m 0755 %SOURCE3 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
install -m 0755 %SOURCE4 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor
+# Create defaults files
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/default
+
+cat >%{buildroot}%{_sysconfdir}/default/mysql-mmm-agent <<EOF
+# mysql-mmm-agent defaults
+ENABLED=1
+EOF
+
+cat >%{buildroot}%{_sysconfdir}/default/mysql-mmm-monitor <<EOF
+# mysql-mmm-monitor defaults
+ENABLED=1
+EOF
+
%clean
%{__rm} -rf %{buildroot}
@@ -176,6 +190,7 @@ fi
%defattr(-,root,root,-)
%doc README
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_agent.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/default/mysql-mmm-agent
%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-agent
%{perl_vendorlib}/MMM/Agent
%{_libexecdir}/mysql-mmm/agent/
@@ -186,6 +201,7 @@ fi
%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
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/default/mysql-mmm-monitor
%attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-monitor
%{perl_vendorlib}/MMM/Monitor
%{_libexecdir}/mysql-mmm/monitor/
@@ -194,6 +210,15 @@ fi
%changelog
+* Thu Feb 25 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-3
+- Fixed init scripts to check for ENABLED only within the start
+ function.
+
+* Tue Feb 23 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-2
+- Added defaults file for mysql-mmm-agent and mysql-mmm-monitor
+- Init scripts exit if ENABLED != 1
+- Fixed typo in mysql-mmm-monitor where mmmd_mon was still referenced
+
* Mon Feb 22 2010 BJ Dierkes <wdierkes at rackspace.com> - 2.1.0-1.1
- Latest sources from upstream
- Updated init scripts to reflect new binary paths
More information about the scm-commits
mailing list