From owner-freebsd-rc@FreeBSD.ORG Tue Sep 17 04:55:32 2013 Return-Path: Delivered-To: rc@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4722CCAA; Tue, 17 Sep 2013 04:55:32 +0000 (UTC) (envelope-from jmg@h2.funkthat.com) Received: from h2.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ECBE929FE; Tue, 17 Sep 2013 04:55:31 +0000 (UTC) Received: from h2.funkthat.com (localhost [127.0.0.1]) by h2.funkthat.com (8.14.3/8.14.3) with ESMTP id r8H4tUnC087159 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 16 Sep 2013 21:55:30 -0700 (PDT) (envelope-from jmg@h2.funkthat.com) Received: (from jmg@localhost) by h2.funkthat.com (8.14.3/8.14.3/Submit) id r8H4tUqe087158; Mon, 16 Sep 2013 21:55:30 -0700 (PDT) (envelope-from jmg) Date: Mon, 16 Sep 2013 21:55:30 -0700 From: John-Mark Gurney To: Hiroki Sato Subject: Re: sendmail queue runner starting multiple times... Message-ID: <20130917045530.GL68682@funkthat.com> References: <20130916214901.GE68682@funkthat.com> <20130917.133239.1751419599170896640.hrs@allbsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130917.133239.1751419599170896640.hrs@allbsd.org> User-Agent: Mutt/1.4.2.3i X-Operating-System: FreeBSD 7.2-RELEASE i386 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (h2.funkthat.com [127.0.0.1]); Mon, 16 Sep 2013 21:55:31 -0700 (PDT) Cc: rc@FreeBSD.org X-BeenThere: freebsd-rc@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Discussion related to /etc/rc.d design and implementation." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2013 04:55:32 -0000 Hiroki Sato wrote this message on Tue, Sep 17, 2013 at 13:32 +0900: > John-Mark Gurney wrote > in <20130916214901.GE68682@funkthat.com>: > > jm> I noticed that if you start sendmail, it doesn't detect that the > jm> mail queue runner is already running and starts it up multiple times... > jm> > jm> My proposed patch is: > jm> --- /usr/src/etc/rc.d/sendmail 2013-01-12 21:34:02.000000000 -0800 > jm> +++ /tmp/sendmail.rc 2013-09-16 14:45:21.000000000 -0700 > jm> @@ -93,7 +93,7 @@ > jm> > jm> name="sendmail_clientmqueue" > jm> rcvar="sendmail_msp_queue_enable" > jm> -start_cmd="${command} ${sendmail_msp_queue_flags}" > jm> pidfile="${sendmail_mspq_pidfile:-/var/spool/clientmqueue/sm-client.pid}" > jm> +start_cmd="[ -z \"`check_pidfile "${pidfile}" "${command}"`\" ] && ${command} ${sendmail_msp_queue_flags} && _run_rc_postcmd" > jm> required_files="/etc/mail/submit.cf" > jm> run_rc_command "$1" > jm> > jm> > jm> This is because setting start_cmd disables the pid checks, so we need > jm> to add them back... This patch won't print out the already running > jm> bit, but we also don't print out the fact that we are starting it, it > jm> doesn't seem like that big of a loss.. > jm> > jm> Is there a better way? If someone else doesn't produce a better patch, > jm> I'll get re's permission to commit in few days... > jm> > jm> Thanks. > jm> > jm> P.S. Please CC me, I'm not on the list. > > Does the attached patch fix this issue? yes, it does, and gives me better messages... I only tested w/ sendmail_enable="YES" and the defaults, but it properly detected the queue runner running, doesn't start multiple copies, and kills the queue runner off properly... Thanks, do you want to take care of committing, or shall I? -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not."