From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 31 Aug 2007 01:24:22 +0400 From: "Dmitry V. Levin" To: ALT Devel discussion list Message-ID: <20070830212422.GA21110@basalt.office.altlinux.org> Mail-Followup-To: ALT Devel discussion list References: <20070830211520.1828B1CB46A4@ssh.git.local.altlinux.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ReaqsoxgOBHFXBhH" Content-Disposition: inline In-Reply-To: <20070830211520.1828B1CB46A4@ssh.git.local.altlinux.org> X-fingerprint: FE4C 93AB E19A 2E4C CB5D 3E4E 7CAB E6AC 9E35 361E Subject: Re: [devel] [git update] packages/nginx: heads/master X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9rc1 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Aug 2007 21:24:20 -0000 Archived-At: List-Archive: List-Post: --ReaqsoxgOBHFXBhH Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Aug 31, 2007 at 01:15:18AM +0400, Denis Smirnov wrote: > Update of /people/mithraen/packages/nginx.git [...] > Full diff since `nginx/0.5.31-alt2' follows: > diff --git a/nginx.init b/nginx.init > index 342181a..290bf4e 100755 > --- a/nginx.init > +++ b/nginx.init > @@ -13,6 +13,8 @@ WITHOUT_RC_COMPAT=3D1 > =20 > LOCKFILE=3D/var/lock/nginx/nginx > PIDFILE=3D/var/run/nginx.pid > +OLDBINPID=3D/var/run/nginx.pid.oldbin > +BINARY=3D/usr/sbin/nginx =FA=C1=DE=C5=CD =DC=D4=CF?? > RETVAL=3D0 > =20 > start() > @@ -26,7 +28,7 @@ start() > =20 > stop() > { > - stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user r= oot --name nginx -- /usr/sbin/nginx > + stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user r= oot --name nginx -- $BINARY =EE=C5 =CE=D5=D6=C5=CE =CE=C9=CB=C1=CB=CF=CA $BINARY, =D7=D9=CB=C9=CE=D8=D4= =C5 --name nginx =C9 =CE=C1=D0=C9=DB=C9=D4=C5 =D0=CF-=DE=C5=CC=CF=D7=C5=DE= =C5=D3=CB=C9. =ED=CF=D6=C5=D4 =C8=CF=D4=D1 =C2=D9 /etc/init.d/template =D0=CF=D3=CD=CF=D4= =D2=C9=D4=C5? > upgrade() > { > - check > - RETVAL=3D$? > - if [ $RETVAL -eq 0 ]; then > - echo -n $"Upgrading nginx: " > - kill -USR2 `cat $PIDFILE` > + conftest > RETVAL=3D$? > + echo -n "Upgrading nginx: " > + if [ $RETVAL -eq 0 ]; then > + # TODO: use start-stop-daemon? > + [ -s "$PIDFILE" ] && kill -USR2 `cat "$PIDFILE"` > + RETVAL=3D$? > + # let the signal through; the system might be fairly busy, > + # so if we don't see the oldpidfile immediately, wait 5 sec > + [ -s "$OLDBINPID" ] || sleep 5 > + [ -s "$OLDBINPID" ] && kill -TERM `cat "$OLDBINPID"` > + success > + else=20 > + failure > + RETVAL=3D1 > + fi =EB=C1=CB=CF=CD=D5 =D0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=C0 =D0=D2=C9=CE=C1=C4= =CC=C5=D6=C9=D4 =C6=C1=CA=CC $PIDFILE? =E4=C5=CC=C1=D4=D8 kill -USR2 `cat "$PIDFILE"` =CE=C5 =C7=CC=D1=C4=D1 =CE=C5=CC=D8=DA=D1, =C5=D3=CC=C9 =D3=CC=CF=D7=CF "= =C2=C5=DA=CF=D0=C1=D3=CE=CF=D3=D4=D8" =C4=CC=D1 =D7=C1=D3 =CE=C5 =D0=D5=D3= =D4=CF=CA =DA=D7=D5=CB. > condrestart) > - [ -e "$LOCKFILE" ] && upgrade ||:=20 > + # package upgrade should invoke upgrade(); > + # sysadmin doing condrestart by hand > + # should invoke restart() if nginx's running. > + # see also manual/triggers in rpm docs > + # and /usr/sbin/post_service > + if ! [ "$RPM_INSTALL_ARG1" -ge 0 ] 2>/dev/null; then > + if [ -e "$LOCKFILE" ]; then > + restart > + fi > + exit 0 > + fi > + if [ "$RPM_INSTALL_ARG1" -gt 1 ]; then > + upgrade > + fi =E1 =D0=CF=DE=C5=CD=D5 =D0=D2=C9 =CF=C2=CE=CF=D7=CC=C5=CE=C9=C9 =D0=C1=CB= =C5=D4=C1 =CE=C5=CC=D8=DA=D1 =D7=D9=D0=CF=CC=CE=C9=D4=D8 =CF=C2=D9=DE=CE=D9= =CA condrestart? --=20 ldv --ReaqsoxgOBHFXBhH Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQFG1zWFfKvmrJ41Nh4RAhIpAJoCH/MbbmIdl27dhMUj05uH3vh6ogCgjyoi exTw5kUBphDjkFLO4O8xjN4= =mtEt -----END PGP SIGNATURE----- --ReaqsoxgOBHFXBhH--