From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#46022: 27.1; kill-emacs should call sd_notify only in daemon mode Date: Fri, 22 Jan 2021 10:19:40 +0200 Message-ID: <83lfcl5qoz.fsf@gnu.org> References: <1795381c3a29a50341502c2c020dccfcddf4be05.camel@timruffing.de> <837do66qcw.fsf@gnu.org> <6b2b3e7c-b8d0-7386-9ecb-fc3aabe262aa@lucaswerkmeister.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="32927"; mail-complaints-to="usenet@ciao.gmane.io" Cc: public@timruffing.de, 46022@debbugs.gnu.org To: Lucas Werkmeister Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 22 09:20:13 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l2rfw-0008SV-VV for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Jan 2021 09:20:12 +0100 Original-Received: from localhost ([::1]:37216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2rfw-0001pO-1F for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Jan 2021 03:20:12 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2rfo-0001p8-EF for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2021 03:20:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2rfm-0006T4-MQ for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2021 03:20:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l2rfm-0001Lz-IP for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2021 03:20:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Jan 2021 08:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46022 X-GNU-PR-Package: emacs Original-Received: via spool by 46022-submit@debbugs.gnu.org id=B46022.16113035975188 (code B ref 46022); Fri, 22 Jan 2021 08:20:02 +0000 Original-Received: (at 46022) by debbugs.gnu.org; 22 Jan 2021 08:19:57 +0000 Original-Received: from localhost ([127.0.0.1]:59983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2rfh-0001Lc-7y for submit@debbugs.gnu.org; Fri, 22 Jan 2021 03:19:57 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:58228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2rff-0001LP-Ce for 46022@debbugs.gnu.org; Fri, 22 Jan 2021 03:19:55 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:59716) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2rfR-0006N0-GL; Fri, 22 Jan 2021 03:19:42 -0500 Original-Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:1747 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1l2rfQ-000092-Ug; Fri, 22 Jan 2021 03:19:41 -0500 In-Reply-To: <6b2b3e7c-b8d0-7386-9ecb-fc3aabe262aa@lucaswerkmeister.de> (message from Lucas Werkmeister on Thu, 21 Jan 2021 21:12:03 +0100) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:198362 Archived-At: > Cc: 46022@debbugs.gnu.org > From: Lucas Werkmeister > Date: Thu, 21 Jan 2021 21:12:03 +0100 > > Hm, I wasn’t aware systemd logged those warnings. Probably a good idea > to guard the sd_notify(0, "STOPPING=1") with a guard on (a stashed copy > of?) daemon_type, then, yes. OK, thanks. Does the patch below seems reasonable and give good results? If yes, I'd like it to go into the upcoming Emacs 27.2. diff --git a/src/emacs.c b/src/emacs.c index f2e858f..67220eb 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -187,7 +187,8 @@ #define MAIN_PROGRAM /* Name for the server started by the daemon.*/ static char *daemon_name; -/* 0 not a daemon, 1 new-style (foreground), 2 old-style (background). */ +/* 0 not a daemon, 1 new-style (foreground), 2 old-style (background). + A negative value means the daemon initialization was already done. */ int daemon_type; #ifndef WINDOWSNT @@ -2371,7 +2372,10 @@ DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P", int exit_code; #ifdef HAVE_LIBSYSTEMD - sd_notify(0, "STOPPING=1"); + /* Notify systemd we are shutting down, but only if we have notified + it about startup. */ + if (daemon_type == -1) + sd_notify(0, "STOPPING=1"); #endif /* HAVE_LIBSYSTEMD */ /* Fsignal calls emacs_abort () if it sees that waiting_for_input is @@ -2876,7 +2880,7 @@ DEFUN ("daemon-initialized", Fdaemon_initialized, Sdaemon_initialized, 0, 0, 0, } /* Set it to an invalid value so we know we've already run this function. */ - daemon_type = -1; + daemon_type = -daemon_type; #else /* WINDOWSNT */ /* Signal the waiting emacsclient process. */