[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 53dfb51: Don't delete socket on server exit if it was passed in
From: |
Lars Ingebrigtsen |
Subject: |
master 53dfb51: Don't delete socket on server exit if it was passed in |
Date: |
Sat, 8 May 2021 08:24:13 -0400 (EDT) |
branch: master
commit 53dfb51f55bf66bb939505c60d12952dd64820a7
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Don't delete socket on server exit if it was passed in
* lisp/server.el (server-sentinel): Don't delete the socket if it
was passed in to Emacs (bug#47511).
---
lisp/server.el | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lisp/server.el b/lisp/server.el
index 220694f..17332a2 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -413,9 +413,14 @@ If CLIENT is non-nil, add a description of it to the
logged message."
;; for possible servers before doing anything, so it *should* be ours.
(and (process-contact proc :server)
(eq (process-status proc) 'closed)
+ ;; If this variable is non-nil, the socket was passed in to
+ ;; Emacs, and not created by Emacs itself (for instance,
+ ;; created by systemd). In that case, don't delete the socket.
+ (not internal--daemon-sockname)
(ignore-errors
(delete-file (process-get proc :server-file))))
- (server-log (format "Status changed to %s: %s" (process-status proc) msg)
proc)
+ (server-log (format "Status changed to %s: %s"
+ (process-status proc) msg) proc)
(server-delete-client proc))
(defun server--on-display-p (frame display)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 53dfb51: Don't delete socket on server exit if it was passed in,
Lars Ingebrigtsen <=