diff options
| author | Ben Pfaff <blp@ovn.org> | 2017-04-13 10:47:55 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-04-24 12:51:25 -0700 |
| commit | fefb757ce408a17f95d8a0c509d5796da45f75fe (patch) | |
| tree | a223718090a195533efad1d305eec0fbb00a828c /xenserver | |
| parent | 3570f7e4379821f6788b2ad953c759eeff70f888 (diff) | |
| download | openvswitch-fefb757ce408a17f95d8a0c509d5796da45f75fe.tar.gz | |
debian, xenserver: Update logrotate config to match RHEL.
Commit 618a5b45ae8b ("rhel: Avoid logrotate error if /var/run/openvswitch
does not exist") updated the RHEL logrotate configuration. This commit
makes similar changes for Debian, by synchronizing with the RHEL version.
In particular:
- Indent to match logrotate.conf(5) examples.
- Use "sharedscripts" flag, because the postrotate script only needs to
run once regardless of the number of rotations.
- Drop "delaycompress", because the postrotate script does make daemons
reopen their log files.
- Ignore errors calling vlog/reopen.
Also make similar changes to the xenserver logrotate script. I confirmed
via Twitter that the xenserver packaging still has users.
CC: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'xenserver')
| -rw-r--r-- | xenserver/etc_logrotate.d_openvswitch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/xenserver/etc_logrotate.d_openvswitch b/xenserver/etc_logrotate.d_openvswitch index 73751d457..cd7b3a9d5 100644 --- a/xenserver/etc_logrotate.d_openvswitch +++ b/xenserver/etc_logrotate.d_openvswitch @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc. +# Copyright (C) 2009, 2010, 2011, 2012, 2017 Nicira, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -6,14 +6,16 @@ # without warranty of any kind. /var/log/openvswitch/*.log { - daily - compress - sharedscripts - missingok - postrotate + daily + compress + sharedscripts + missingok + postrotate # Tell Open vSwitch daemons to reopen their log files - for pidfile in `cd /var/run/openvswitch && echo *.pid`; do - ovs-appctl -t "${pidfile%%.pid}" vlog/reopen - done - endscript + if [ -d /var/run/openvswitch ]; then + for pidfile in `cd /var/run/openvswitch && echo *.pid`; do + ovs-appctl -t "${pidfile%%.pid}" vlog/reopen 2>/dev/null || : + done + fi + endscript } |