OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 29-Aug-2003 17:02:52
Branch: HEAD Handle: 2003082916025101
Modified files:
openpkg-src/mysql3 mysql3.spec rc.mysql3
openpkg-web news.txt
Log:
Implement features in ticket #202, treat log files separately in daily
ops
Summary:
Revision Changes Path
1.20 +25 -2 openpkg-src/mysql3/mysql3.spec
1.10 +48 -16 openpkg-src/mysql3/rc.mysql3
1.6330 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/mysql3.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 mysql3.spec
--- openpkg-src/mysql3/mysql3.spec 5 Aug 2003 13:37:38 -0000 1.19
+++ openpkg-src/mysql3/mysql3.spec 29 Aug 2003 15:02:52 -0000 1.20
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20030805
+Release: 20030829
# package options
%option with_berkeleydb yes
@@ -215,8 +215,16 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} mysql3 status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} mysql3 stop 2>/dev/null
+ exit 0
+
%post
- # create initial database
+ if [ $1 -eq 1 ]; then
+ # after install, create initial database
$RPM_INSTALL_PREFIX/bin/mysql_install_db \
--defaults-file=$RPM_INSTALL_PREFIX/etc/mysql/my.cnf
chown %{l_rusr}:%{l_rgrp} \
@@ -228,4 +236,19 @@
echo "to work you must keep a copy (plain text) of the administrator"
echo "account in '$RPM_INSTALL_PREFIX/etc/mysql/my.pwd'."
) | %{l_rpmtool} msg -b -t notice
+ fi
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ { eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}; true; } >/dev/null 2>&1
+ [ ".$mysql_active" = .yes ] && %{l_rc} mysql3 start
+ fi
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} mysql3 stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/mysql/*.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/mysql/*.err* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/rc.mysql3
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.mysql3
--- openpkg-src/mysql3/rc.mysql3 22 Jul 2003 08:10:53 -0000 1.9
+++ openpkg-src/mysql3/rc.mysql3 29 Aug 2003 15:02:52 -0000 1.10
@@ -7,11 +7,21 @@
mysql3_enable="$openpkg_rc_def"
[EMAIL PROTECTED]@/etc/mysql/my.pwd
[EMAIL PROTECTED]@/etc/mysql/my.cnf
- mysql3_log_prolog="true"
- mysql3_log_epilog="true"
- mysql3_log_numfiles="10"
- mysql3_log_minsize="1M"
- mysql3_log_complevel="9"
+ mysql3_common_prolog="true"
+ mysql3_common_epilog="true"
+ mysql3_common_numfiles="10"
+ mysql3_common_minsize="1M"
+ mysql3_common_complevel="9"
+ mysql3_update_prolog="true"
+ mysql3_update_epilog="true"
+ mysql3_update_numfiles="10"
+ mysql3_update_minsize="1M"
+ mysql3_update_complevel="9"
+ mysql3_err_prolog="true"
+ mysql3_err_epilog="true"
+ mysql3_err_numfiles="10"
+ mysql3_err_minsize="1M"
+ mysql3_err_complevel="9"
%common
# same paths as in my.cnf
@@ -20,12 +30,12 @@
[EMAIL PROTECTED]@/var/mysql/common.log
[EMAIL PROTECTED]@/var/mysql/update.log
-%status -u @l_susr@ -o
+%status -u @l_rusr@ -o
mysql3_usable="unknown"
mysql3_active="no"
@l_prefix@/bin/mysql3admin \
--defaults-extra-file=${mysql3_pwd_file} \
- ping 2>/dev/null && mysql3_active="yes"
+ ping >/dev/null 2>&1 && mysql3_active="yes"
if [ $mysql3_active = "no" -a -f $mysql3_pid_file ] ; then
kill -0 `cat $mysql3_pid_file` && mysql3_active="unknown"
fi
@@ -35,6 +45,7 @@
%start -p 400 -u @l_rusr@
rcService mysql3 enable yes || exit 0
+ rcService mysql3 active yes && exit 0
cd @l_prefix@
@l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
[EMAIL PROTECTED]@ \
@@ -43,12 +54,14 @@
%stop -p 400 -u @l_rusr@
rcService mysql3 enable yes || exit 0
+ rcService mysql3 active no && exit 0
@l_prefix@/bin/mysqladmin \
--defaults-extra-file=${mysql3_pwd_file} \
shutdown
%restart -p 400 -u @l_rusr@
rcService mysql3 enable yes || exit 0
+ rcService mysql3 active no && exit 0
cd @l_prefix@
@l_prefix@/bin/mysqladmin \
--defaults-extra-file=${mysql3_pwd_file} \
@@ -60,14 +73,33 @@
%daily -u @l_rusr@
rcService mysql3 enable yes || exit 0
+
+ # rotate logfiles
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
+ shtool rotate -f \
+ -n ${mysql3_common_numfiles} -s ${mysql3_common_minsize} -d \
+ -z ${mysql3_common_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
+ -P "${mysql3_common_prolog}" \
+ -E "${mysql3_common_epilog} && @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql3_pwd_file} flush-logs" \
+ ${mysql3_common_log}
shtool rotate -f \
- -n ${mysql3_log_numfiles} -s ${mysql3_log_minsize} -d \
- -z ${mysql3_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
- -P "${mysql3_log_prolog}" \
- -E "@l_prefix@/bin/mysqladmin \
- --defaults-extra-file=${mysql3_pwd_file} \
- flush-logs; ${mysql3_log_epilog}" \
- ${mysql3_log_common} \
- ${mysql3_log_update} \
- ${mysql3_log_err}
+ -n ${mysql3_update_numfiles} -s ${mysql3_update_minsize} -d \
+ -z ${mysql3_update_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
+ -P "${mysql3_update_prolog}" \
+ -E "${mysql3_update_epilog} && @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql3_pwd_file} flush-logs" \
+ ${mysql3_update_log}
+ shtool rotate -f \
+ -n ${mysql3_err_numfiles} -s ${mysql3_err_minsize} -d \
+ -z ${mysql3_err_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
+ -P "${mysql3_err_prolog}" \
+ -E "${mysql3_err_epilog} && @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql3_pwd_file} flush-logs" \
+ ${mysql3_err_log}
+ if [ -s $hintfile ]; then
+ rc mysql3 restart
+ fi
+ rcTmp -k
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6329 -r1.6330 news.txt
--- openpkg-web/news.txt 29 Aug 2003 14:54:12 -0000 1.6329
+++ openpkg-web/news.txt 29 Aug 2003 15:02:51 -0000 1.6330
@@ -1,3 +1,4 @@
+29-Aug-2003: Upgraded package: P<mysql3-3.23.57-20030829>
29-Aug-2003: Upgraded package: P<mysql-4.0.14-20030829>
29-Aug-2003: Upgraded package: P<mico-2.3.10-20030829>
29-Aug-2003: Upgraded package: P<amavisd-20030616p5-20030829>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
