From owner-cvs-all@FreeBSD.ORG Wed Mar 17 02:31:07 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D57C1065672; Wed, 17 Mar 2010 02:31:07 +0000 (UTC) (envelope-from martinp@tildeslash.com) Received: from www.tildeslash.com (tildeslash.com [62.109.39.247]) by mx1.freebsd.org (Postfix) with ESMTP id 259BF8FC12; Wed, 17 Mar 2010 02:31:06 +0000 (UTC) Received: by www.tildeslash.com (Postfix, from userid 1003) id 522A21D1BA9; Wed, 17 Mar 2010 03:12:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on tildeslash1 X-Spam-Level: X-Spam-Status: No, score=-1.5 required=4.3 tests=ALL_TRUSTED,AWL,BAYES_50 autolearn=no version=3.2.5 Received: from [192.168.1.2] (r2q63.net.upc.cz [62.245.80.63]) by www.tildeslash.com (Postfix) with ESMTPSA id 2965A1D02CB; Wed, 17 Mar 2010 03:12:07 +0100 (CET) Mime-Version: 1.0 (Apple Message framework v1077) Content-Type: text/plain; charset=us-ascii From: Martin Pala In-Reply-To: <4B9EEFA3.80106@FreeBSD.org> Date: Wed, 17 Mar 2010 03:12:05 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: <0E8E3FB7-40B8-4666-A3B6-462621F43B98@tildeslash.com> References: <201003160209.o2G29ieE041601@repoman.freebsd.org> <4B9EEFA3.80106@FreeBSD.org> To: Doug Barton X-Mailer: Apple Mail (2.1077) Cc: Wen Heping , cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/sysutils/monit/files monit.sh.in X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2010 02:31:07 -0000 On Mar 16, 2010, at 3:40 AM, Doug Barton wrote: > On 03/15/10 19:09, Wen Heping wrote: >> wen 2010-03-16 02:09:44 UTC >>=20 >> FreeBSD ports repository >>=20 >> Modified files: >> sysutils/monit/files monit.sh.in=20 >> Log: >> - Improve rc script >>=20 >> PR: ports/144772 = http://www.FreeBSD.org/cgi/query-pr.cgi?pr=3D144772 >> Submitted by: Martin Pala (maintainer) >>=20 >> Revision Changes Path >> 1.2 +7 -5 ports/sysutils/monit/files/monit.sh.in >>=20 >> = http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/sysutils/monit/files/monit.sh.= in.diff?&r1=3D1.1&r2=3D1.2&f=3Dh >=20 > Documenting the _flags option in comments is an improvement, yes. > Everything else is a pessimization; particularly since the default > assignment for monit_enable is now broken. >=20 > I've attached a patch that fixes the following issues: > 1. General re-sorting to match conventions. > 2. Change the default for _enable to the conventional method, and fix = it > as a side effect. Also move it down past load_rc_config. Otherwise > testing for a value first is meaningless. > 3. Eliminate the need for $default_config >=20 > Martin, please test this and respond ASAP. Since the script as = committed > is now broken, it needs to be fixed. >=20 Hi, no, the script is not broken - it works the same as before, i have = tested it and found no issues - if you can reproduce any problem, please = provide details. The monit_enable works OK with both values. The testing = of monit_enable value before load_rc_config works OK - it should always = fail and the monit_enable is set to "NO", which can be overridden by = load_rc_config (is executed post this setting). I think your patch is not necessary - it does cosmetic modifications = only. For example apache rc script has very similar structure as monit = rc script. Regards, Martin