From patchwork Sat Mar 9 09:23:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Mellor X-Patchwork-Id: 61572 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BAADC27BBEA; Sat, 9 Mar 2024 09:23:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3733327BBE2 for ; Sat, 9 Mar 2024 09:23:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1risvU-0000FL-Vr; Sat, 09 Mar 2024 04:23:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1risvS-0000Ef-8b for guix-patches@gnu.org; Sat, 09 Mar 2024 04:23:30 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1risvR-0004a2-WB for guix-patches@gnu.org; Sat, 09 Mar 2024 04:23:30 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1risvy-0007JQ-Ft for guix-patches@gnu.org; Sat, 09 Mar 2024 04:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69269] [PATCH v2] gnu: web: fcgiwrap: remove UNIX socket when service stopped. Resent-From: Dale Mellor Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Mar 2024 09:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69269 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69269@debbugs.gnu.org Cc: blackhole@rdmp.org X-Debbugs-Original-Cc: Dale Mellor , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170997624028092 (code B ref -1); Sat, 09 Mar 2024 09:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Mar 2024 09:24:00 +0000 Received: from localhost ([127.0.0.1]:60669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1risvv-0007J1-JM for submit@debbugs.gnu.org; Sat, 09 Mar 2024 04:23:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:57030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1risvu-0007Iv-OV for submit@debbugs.gnu.org; Sat, 09 Mar 2024 04:23:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1risvN-0000DK-TK for guix-patches@gnu.org; Sat, 09 Mar 2024 04:23:25 -0500 Received: from [195.15.247.228] (helo=rdmp.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1risvM-0004ZA-EI for guix-patches@gnu.org; Sat, 09 Mar 2024 04:23:25 -0500 Received: from [127.0.0.1] (helo=localhost.localdomain) by rdmp.org with esmtp (Exim 4.96.1) (envelope-from ) id 1risuj-0005DN-01; Sat, 09 Mar 2024 09:23:21 +0000 From: Dale Mellor Date: Sat, 9 Mar 2024 09:23:11 +0000 Message-ID: <20240309092311.2085201-1-guix-devel-0brg6b@rdmp.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 195.15.247.228 (failed) Received-SPF: pass client-ip=195.15.247.228; envelope-from=guix-devel-0brg6b@rdmp.org; helo=rdmp.org X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Dale Mellor The generic kill destructor is used to terminate the process, but if it was configured to use a UNIX socket, that socket gets left behind. Subsequent attempts to re-start the service then fail with a 'socket in use' error. So we perform extra duty in the stop action to clean up if necessary. * gnu/services/web.scm: new logic in fcgiwrap-shephard-service. --- gnu/services/web.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 05fd71f9949..877e15342b0 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -907,7 +907,14 @@ (define fcgiwrap-shepherd-service "-s" #$socket) #:user #$user #:group #$group #:log-file "/var/log/fcgiwrap.log")) - (stop #~(make-kill-destructor))))))) + (stop #~(let ((mkd (make-kill-destructor))) + (lambda x + (apply mkd x) + (when (string-prefix? "unix:" #$socket) + (let ((socket (substring #$socket 5))) + (when (access? socket F_OK) + (delete-file socket)))) + #f)))))))) (define fcgiwrap-activation (match-lambda