Message ID | 20191011184205.30715-1-ipfr@tfitzgeorge.me.uk |
---|---|
State | Accepted |
Commit | 28797d488e51901076a350242c014ff140e58d5f |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 46qcJD4dcxz3yqX for <patchwork@web04.haj.ipfire.org>; Fri, 11 Oct 2019 18:42:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46qcJC1v0Dz2GP; Fri, 11 Oct 2019 18:42:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46qcJB6N3bz2yfS; Fri, 11 Oct 2019 18:42:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46qcJ93RRSz2yN4 for <development@lists.ipfire.org>; Fri, 11 Oct 2019 18:42:17 +0000 (UTC) Received: from smtp.hosts.co.uk (smtp.hosts.co.uk [85.233.160.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 46qcJ74GQdz2GP for <development@lists.ipfire.org>; Fri, 11 Oct 2019 18:42:15 +0000 (UTC) Received: from [95.150.182.195] (helo=aragorn.tfitzgeorge.me.uk) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from <ipfr@tfitzgeorge.me.uk>) id 1iIzrb-0004us-9f; Fri, 11 Oct 2019 19:42:09 +0100 From: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk> To: development@lists.ipfire.org Subject: [PATCH] Restart logging after restoring backup Date: Fri, 11 Oct 2019 19:42:05 +0100 Message-Id: <20191011184205.30715-1-ipfr@tfitzgeorge.me.uk> X-Mailer: git-send-email 2.16.4 Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of ipfr@tfitzgeorge.me.uk designates 85.233.160.19 as permitted sender) smtp.mailfrom=ipfr@tfitzgeorge.me.uk X-Rspamd-Queue-Id: 46qcJ74GQdz2GP X-Spamd-Result: default: False [-3.38 / 11.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[195.182.150.95.zen.spamhaus.org : 127.0.0.11]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:85.233.160.0/27]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[tfitzgeorge.me.uk]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[mx1.ukservers.net]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-0.99)[-0.990,0]; IP_SCORE(0.02)[country: GB(0.08)]; RCVD_IN_DNSWL_LOW(-0.10)[19.160.233.85.list.dnswl.org : 127.0.5.1]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:8622, ipnet:85.233.160.0/19, country:GB]; RCVD_COUNT_TWO(0.00)[2]; BAYES_HAM(-3.00)[100.00%]; FROM_EQ_ENVFROM(0.00)[] X-Rspamd-Server: mail01.haj.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
Restart logging after restoring backup
|
|
Commit Message
Tim FitzGeorge
Oct. 11, 2019, 6:42 p.m. UTC
Send SIGHUP to syslogd and suricata after restoring backup. This ensures that
if the restored backup includes log files that any new log messages get
appended to the restored log files. Otherwise they will be written to the
old log files which are pending deletion.
httpd is told to restart using apachectl, which is the equivalent of sending
a signal. 'graceful' (USR1) is used rather than 'restart' (HUP) because the
latter immediately kills the process restoring the backup, preventing
converters from running.
Fixes: 12196
Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
---
config/backup/backup.pl | 5 +++++
1 file changed, 5 insertions(+)
Comments
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org> > On 11 Oct 2019, at 19:42, Tim FitzGeorge <ipfr@tfitzgeorge.me.uk> wrote: > > Send SIGHUP to syslogd and suricata after restoring backup. This ensures that > if the restored backup includes log files that any new log messages get > appended to the restored log files. Otherwise they will be written to the > old log files which are pending deletion. > > httpd is told to restart using apachectl, which is the equivalent of sending > a signal. 'graceful' (USR1) is used rather than 'restart' (HUP) because the > latter immediately kills the process restoring the backup, preventing > converters from running. > > Fixes: 12196 > Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk> > --- > config/backup/backup.pl | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/config/backup/backup.pl b/config/backup/backup.pl > index 6ac4e4967..b1dd1d297 100644 > --- a/config/backup/backup.pl > +++ b/config/backup/backup.pl > @@ -71,6 +71,11 @@ restore_backup() { > > tar xvzpf "${filename}" -C / > > + # Restart syslogd, httpd and suricata in case we've just loaded old logs > + apachectl -k graceful > + /bin/kill -HUP `cat /var/run/suricata.pid 2> /dev/null` 2> /dev/null > + /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null > + > # Run converters > > # Outgoing Firewall > -- > 2.16.4 >
diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 6ac4e4967..b1dd1d297 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -71,6 +71,11 @@ restore_backup() { tar xvzpf "${filename}" -C / + # Restart syslogd, httpd and suricata in case we've just loaded old logs + apachectl -k graceful + /bin/kill -HUP `cat /var/run/suricata.pid 2> /dev/null` 2> /dev/null + /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null + # Run converters # Outgoing Firewall