From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id wFNaFJ0q7GUCBwAA62LTzQ:P1 (envelope-from ) for ; Sat, 09 Mar 2024 10:23:41 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id wFNaFJ0q7GUCBwAA62LTzQ (envelope-from ) for ; Sat, 09 Mar 2024 10:23:41 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709976221; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=JZHSd/+rrP1hLvQNH6KGGzwznptpltvwa+T5XjT44hg=; b=iywBDMKn+aZ+dWOQ0YMYVfkJPiobX+ojq96Nlg/WsrhOcK41l9EK8UwXG6m2R2A4KMX1Xw Ld5PwPOe0hL1shTRwCk0p5Hpl//c60F7SCpbOD5hd0vFr82ll3jAt53d+Q7lfswOa4u3XX laz6GP57TjGN9UVUhRNoYOy1XAtMh8ql3hEzAHtQt/zBZ/uTK8T7ZqhRgq+D9v4EObvnJm hqmp8WG8TTHwDOXMAb4+VJqc4jZv3V0b9h7MP82wG0RkWcp37wOfijcG5iKQqeOhGBC8ho hLTZv/F200VcfqAzCpn1wE65Fmz0WA2BzK70Qp87hQXspO1iXgo2ilhpFHX8Xg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709976221; a=rsa-sha256; cv=none; b=UTRU2z/kuxNQokufM7cT7ijrSM9bkni0IVbOdF441PgZaOTD5DJEbZQBRSsKTKre07xo/l oEzW+VNMO1mvF9fp+vYbCibLBINld3GH4ZrwIu+dOWUu6TuC8MEjFWhRX4X7qFxF7HUU2a EywMGOe8kpU9721TQDaeBFfaFkRXZDzo/F6wvmGBt0oR2wnamryZriOpBqug69X2pFoanN b7XnkiG4jkRdPclFqXYyRsn4omEPTZABybjOT65eb2RViXpJlUyOhs1HxdcFTw69eAtbh6 pSzQE4mwi2VekvTg5oDISDmNTTb7f/kqc/PQQ0V5o2SRQ8ROqeUCApXXObnVwQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1C7AF1FAE8 for ; Sat, 9 Mar 2024 10:23:41 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.98 X-Spam-Score: -4.98 X-Migadu-Queue-Id: 1C7AF1FAE8 X-TUID: /a4bCRz4WOIF 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 -- 2.41.0