From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI autolearn=ham autolearn_force=no version=3.4.4 Received: from alyss.skarnet.org (alyss.skarnet.org [95.142.172.232]) by inbox.vuxu.org (Postfix) with SMTP id CF83A21D13 for ; Thu, 28 Mar 2024 02:16:11 +0100 (CET) Received: (qmail 23203 invoked by uid 89); 28 Mar 2024 01:16:34 -0000 Mailing-List: contact supervision-help@list.skarnet.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Received: (qmail 23195 invoked from network); 28 Mar 2024 01:16:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711588565; x=1712193365; darn=list.skarnet.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=LpJERGnk+jCWgSAXZLx5w7GdwahO2BSSgaTjOd1v0mw=; b=amUwMKNUKNKn4gOwM9NaOnGK7cCzC2iAb9KOC1KdRpbSRikw2Dso+t9WSI5WFfJtv2 Ndxvss04aX1I5iPalqTJ5OpmPvThpTjuQbu7wjtHUTPkzfjlFsyUYuGAN0o3zH+1Vd1A w2WzMqZbSHoln76u5LLekEJd2cKGCXkztwGv37iQf3y0gkmoFAsqf3VagCLt7Tb7dXyC 5e8NGntRxJTryucp7N46oXuA0qRTxiq2OeV3c+gIQzsQ1weTm+VQJxDQgNejc5pP+Ki3 F4kwzxxXTmKcnrfOrzDAl/EoSF4Ee2tXd4dAjGV7vw/wd9ghXJs70S8h/doXIiO7+MZa I2Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711588565; x=1712193365; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LpJERGnk+jCWgSAXZLx5w7GdwahO2BSSgaTjOd1v0mw=; b=sCI/LNKSq21zaF26bxzUunXSoABsALoWMGS423NPZ/HnLpCtTzvfykHq6xP9+417pA 0A99+WTRY1pYlqNtV+WQSMky+2D5Gw7GoyLe35k1tsdKiGiEWm4Z7qxoX83l5jKgWqtL vXO406NClmOK7/akvqi7f/REctbqUaBDPDpl7NoaP1UKgTuZJhfJqklxMmIYNz1nkrSQ 60qGwICoBE6CM3FUPer3+KczElCFpfQ3t8QzU9GT+BI02YQwBVC5kc4SqksUJfmEbGQ8 fr1CI/Oxw65ATXW32wYefmAunk6chWmoxqmiat+rNpGgNJCy4Uz571Qug8MeqzeBGdKE D1Ng== X-Gm-Message-State: AOJu0YwCPRUHP45ip/gsT1XyKv+PcmNml8bqJWMViXICD0hoNsHnKzpR ZYMGYeEZlHEonqmR2SHnpeHe0Q5twy6hRRz1SUqv3tOGYeSOdtMhNvEYDpFko3i2TAJigmRpPF8 aWLL35lWxiklxQpH8gDWkHNh0JS1m/ZP9 X-Google-Smtp-Source: AGHT+IEFP2jb22UO9rMNUSPfDFyZUu4QnH7L6wxZX/BLx9Z8ZPE6IReTZJCHO0GAPdrl6qPfrIYhJsiibXvGiSN34AE= X-Received: by 2002:ad4:4188:0:b0:696:7fbb:d3e4 with SMTP id e8-20020ad44188000000b006967fbbd3e4mr1359162qvp.55.1711588565532; Wed, 27 Mar 2024 18:16:05 -0700 (PDT) MIME-Version: 1.0 From: Andrew Stiegmann Date: Wed, 27 Mar 2024 17:15:54 -0800 Message-ID: Subject: Prevent runit from deleting own processing file To: supervision@list.skarnet.org Content-Type: multipart/alternative; boundary="0000000000007347430614ae44a9" --0000000000007347430614ae44a9 Content-Type: text/plain; charset="UTF-8" Evening folks. Wanted to share a patch I recently put together to prevent a runaway busyloop in svlogd when system time is far behind. It effectively prevents svlogd from deleting the file its about to process, which can happen when system time is far behind. Cheers. diff --git a/src/svlogd.c b/src/svlogd.c index 2e79219..d47fc47 100644 --- a/src/svlogd.c +++ b/src/svlogd.c @@ -256,6 +256,10 @@ void rmoldest(struct logdir *ld) { if (unlink(f->d_name) == -1) warn2("unable to unlink processor leftover", f->d_name); } + else if (!str_diff(ld->fnsave, f->d_name)) { + if (verbose) + strerr_warn5(INFO, "preserve: ", ld->name, "/", ld->fnsave, 0); + } else { ++n; if (str_diff(f->d_name, oldest) < 0) byte_copy(oldest, 27, f->d_name); -- Andrew AV. Stiegmann --0000000000007347430614ae44a9--