From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Juanma Barranquero" Newsgroups: gmane.emacs.devel Subject: Re: bug in server-start Date: Tue, 16 Dec 2008 10:38:10 +0100 Message-ID: References: <18758.7352.558182.931572@kahikatea.snap.net.nz> <18758.14760.572830.277734@kahikatea.snap.net.nz> <200812151724.mBFHOSnS029425@mothra.ics.uci.edu> <18759.21210.387155.565065@a1ihome1.kph.uni-mainz.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1229420324 19796 80.91.229.12 (16 Dec 2008 09:38:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 16 Dec 2008 09:38:44 +0000 (UTC) Cc: Nick Roberts , Dan Nicolaescu , Stefan Monnier , emacs-devel@gnu.org To: "Ulrich Mueller" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 16 10:39:50 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LCWOq-0007qc-Vi for ged-emacs-devel@m.gmane.org; Tue, 16 Dec 2008 10:39:33 +0100 Original-Received: from localhost ([127.0.0.1]:56967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LCWNe-00053t-VJ for ged-emacs-devel@m.gmane.org; Tue, 16 Dec 2008 04:38:19 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LCWNY-000530-Ax for emacs-devel@gnu.org; Tue, 16 Dec 2008 04:38:12 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LCWNX-00052g-P7 for emacs-devel@gnu.org; Tue, 16 Dec 2008 04:38:11 -0500 Original-Received: from [199.232.76.173] (port=40574 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LCWNX-00052c-Ib for emacs-devel@gnu.org; Tue, 16 Dec 2008 04:38:11 -0500 Original-Received: from yw-out-1718.google.com ([74.125.46.155]:23200) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LCWNX-0003lZ-0o for emacs-devel@gnu.org; Tue, 16 Dec 2008 04:38:11 -0500 Original-Received: by yw-out-1718.google.com with SMTP id 9so1293549ywk.66 for ; Tue, 16 Dec 2008 01:38:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=yEufFiCc8w9QgA1XhsB/kjW4RPDLy39P9F00Z9gWY+M=; b=m8Z4qtjtr4CDDkLSNjZTIiMX0RQV6tYccpkxi+xG6c9jn8Us+ABPxDupyl8URlzFkL T3JEO919IxIxbJWh7NzZkTtFwF/xzS1dLfdVbmqS6Pjxj8U+6Fw5hQQB1ZUfwMcWCVCG 7UVNY4b//lQSKU1wvOYIf6SAWuGshlD4iJUHU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=LXkhhLyaMovsCHu+RJSTVBrEPq8YEd2ljfRGKxW1IGrm4gm/T2qEcua58zKFsT/x/x 9Fy4sM1HWFBz7wyVBb8UpEVLTWdu4s/mtzUcp+fkrVjIN8qVqYdPk84wHqyEoeH+aNrY R1Jq0yr5oiu2/42L5DuTajyEubGsnFIlxgcwo= Original-Received: by 10.100.140.20 with SMTP id n20mr5315702and.135.1229420290404; Tue, 16 Dec 2008 01:38:10 -0800 (PST) Original-Received: by 10.100.13.13 with HTTP; Tue, 16 Dec 2008 01:38:10 -0800 (PST) In-Reply-To: <18759.21210.387155.565065@a1ihome1.kph.uni-mainz.de> Content-Disposition: inline X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:106958 Archived-At: On Tue, Dec 16, 2008 at 08:03, Ulrich Mueller wrote: > Exit with an error, please. And if possible, the parent process should > return a nonzero exit status. (AFAICS, not calling daemon-initialized > should be sufficient for this, but I haven't tested it.) Please, try the attached patch. Juanma Index: lisp/server.el =================================================================== RCS file: /sources/emacs/emacs/lisp/server.el,v retrieving revision 1.176 diff -u -2 -r1.176 server.el --- lisp/server.el 12 Dec 2008 00:33:34 -0000 1.176 +++ lisp/server.el 16 Dec 2008 09:21:13 -0000 @@ -480,5 +480,6 @@ (ignore-errors (delete-file server-file)) (setq server-mode nil) ;; already set by the minor mode code - (error "Server %S is already running" server-name)) + (display-warning 'server (format "Server %S is already running" server-name)) + (setq leave-dead t)) ;; If this Emacs already had a server, clear out associated status. (while server-clients @@ -487,5 +488,5 @@ (if leave-dead (progn - (server-log (message "Server stopped")) + (unless (eq t leave-dead) (server-log (message "Server stopped"))) (setq server-process nil)) ;; Make sure there is a safe directory in which to place the socket. Index: lisp/startup.el =================================================================== RCS file: /sources/emacs/emacs/lisp/startup.el,v retrieving revision 1.523 diff -u -2 -r1.523 startup.el --- lisp/startup.el 22 Nov 2008 20:44:42 -0000 1.523 +++ lisp/startup.el 16 Dec 2008 09:22:11 -0000 @@ -695,4 +695,5 @@ (defvar server-name) +(defvar server-process) (defun command-line () @@ -1221,5 +1222,8 @@ (when (stringp dn) (setq server-name dn)) (server-start) - (daemon-initialized))) + (if server-process + (daemon-initialized) + (message "Could not start daemon %S" server-name) + (kill-emacs 1)))) ;; Run emacs-session-restore (session management) if started by