[26831] in Source-Commits
Re: /svn/athena r25780 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Wed Oct 3 13:58:18 2012
Date: Wed, 3 Oct 2012 13:58:09 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201210031634.q93GYoqs002826@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1210031357510.22950@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK to -proposed, since this is actively causing problems.
-Ben
On Wed, 3 Oct 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-10-03 12:34:50 -0400 (Wed, 03 Oct 2012)
> New Revision: 25780
>
> Modified:
> trunk/debathena/config/syslog-config/debian/50-debathena-syslog-config.conf
> trunk/debathena/config/syslog-config/debian/changelog
> trunk/debathena/config/syslog-config/debian/debathena-syslog-config.postinst
> Log:
> In syslog-config:
> * Re-try the fix from 1.7, with restarting rsyslog, not reloading it
>
>
> Modified: trunk/debathena/config/syslog-config/debian/50-debathena-syslog-config.conf
> ===================================================================
> --- trunk/debathena/config/syslog-config/debian/50-debathena-syslog-config.conf 2012-10-02 19:56:29 UTC (rev 25779)
> +++ trunk/debathena/config/syslog-config/debian/50-debathena-syslog-config.conf 2012-10-03 16:34:50 UTC (rev 25780)
> @@ -1,2 +1,7 @@
> +# Drop afs' byte-range lock message (kern.warning)
> +# Yes, we want 'lock', not 'locks', to match both kinds of
> +# of messages. And yes, we want 'afs' in the msg field,
> +# since the actual tag/program is 'kernel'
> +:msg,contains,"afs: byte-range lock" ~
> # Send everything else to wslogger
> -*.err;user,auth.info @WSLOGGER.MIT.EDU
> +*.warning;user,auth.info @WSLOGGER.MIT.EDU
>
> Modified: trunk/debathena/config/syslog-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/syslog-config/debian/changelog 2012-10-02 19:56:29 UTC (rev 25779)
> +++ trunk/debathena/config/syslog-config/debian/changelog 2012-10-03 16:34:50 UTC (rev 25780)
> @@ -1,3 +1,9 @@
> +debathena-syslog-config (1.9) unstable; urgency=low
> +
> + * Re-try the fix from 1.7, with restarting rsyslog, not reloading it
> +
> + -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Oct 2012 12:34:40 -0400
> +
> debathena-syslog-config (1.8) unstable; urgency=low
>
> * Previous fix didn't work; give up and drop everything below err.
>
> Modified: trunk/debathena/config/syslog-config/debian/debathena-syslog-config.postinst
> ===================================================================
> --- trunk/debathena/config/syslog-config/debian/debathena-syslog-config.postinst 2012-10-02 19:56:29 UTC (rev 25779)
> +++ trunk/debathena/config/syslog-config/debian/debathena-syslog-config.postinst 2012-10-03 16:34:50 UTC (rev 25780)
> @@ -74,9 +74,9 @@
> cleanup_old_diversion /etc/syslog.conf.debathena
>
> if hash invoke-rc.d; then
> - invoke-rc.d rsyslog reload
> + invoke-rc.d rsyslog restart
> else
> - /etc/init.d/rsyslog reload
> + /etc/init.d/rsyslog restart
> fi
> else
> # We're using sysklogd
>
>
