From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 1/2] pakfire: Prevent from get launched multiple times.
Date: Tue, 25 May 2021 10:58:28 +0100
Message-ID: <B8AD32B7-AE97-483D-BF44-046B1EBA9136@ipfire.org>
In-Reply-To: <20210524173821.4596-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3988537050283783676=="
List-Id: <development.lists.ipfire.org>

--===============3988537050283783676==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Thank you very much.

I merged this and hopefully this won=E2=80=99t break anything *fingers crosse=
d*.

> On 24 May 2021, at 18:38, Stefan Schantl <stefan.schantl(a)ipfire.org> wrot=
e:
>=20
> When pakfire gets launched a check if a so called lockfile exists and
> the process will be aborted, otherwise the file will be created which
> prevents any other pakfire instance to perform any operations until the
> first process gets finished and the lock will be released again.
>=20
> Because the release of the lock is located in an END block, the lock
> also will be released in case the pakfire process gets interuped or
> gains an error.
>=20
> This prevents from an lock loop and an unuseable pakfire.
>=20
> Reference: #12621.
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> src/pakfire/lib/functions.pl |  3 +++
> src/pakfire/pakfire          | 26 +++++++++++++++++++++++++-
> 2 files changed, 28 insertions(+), 1 deletion(-)
>=20
> diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
> index 4d5c6219a..f9a19b60d 100644
> --- a/src/pakfire/lib/functions.pl
> +++ b/src/pakfire/lib/functions.pl
> @@ -73,6 +73,9 @@ my %pakfiresettings =3D ();
> # Make version
> $Conf::version =3D &make_version();
>=20
> +# Pakfire lock file.
> +our $lockfile =3D "/tmp/pakfire_lock";
> +
> sub message {
> 	my $message =3D shift;
> 	=09
> diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
> index c69a8d3ad..4139d106b 100644
> --- a/src/pakfire/pakfire
> +++ b/src/pakfire/pakfire
> @@ -2,7 +2,7 @@
> ###########################################################################=
####
> #                                                                          =
   #
> # IPFire.org - A linux based firewall                                      =
   #
> -# Copyright (C) 2007-2015   IPFire Team   <info(a)ipfire.org>             =
      #
> +# Copyright (C) 2007-2021   IPFire Team   <info(a)ipfire.org>             =
      #
> #                                                                          =
   #
> # This program is free software: you can redistribute it and/or modify     =
   #
> # it under the terms of the GNU General Public License as published by     =
   #
> @@ -31,6 +31,7 @@
> =09
> 	my $interactive =3D 1;
> 	my $force =3D "noforce";
> +	my $locked;
> =09
> 	&Pakfire::logger("PAKFIRE INFO: IPFire Pakfire $Conf::version started!");
>=20
> @@ -47,6 +48,21 @@
> 		&Pakfire::message("PAKFIRE ERROR: You need to be online to run pakfire!");
> 		exit 2;
> 	}
> +
> +	# Check if a lockfile already exists.
> +	if (-e "$Pakfire::lockfile") {
> +		&Pakfire::message("PAKFIRE ERROR: Another instance of pakfire is already=
 running!");
> +		exit 1;
> +	}
> +
> +	# Write lockfile.
> +	open(LOCK, ">$Pakfire::lockfile");
> +
> +	# Pakfire has locked in this session set locket to "1".
> +	$locked =3D "1";
> +
> +	# Close filehandle.
> +	close(LOCK);
> =09
> 	### Check if we are started by another name
> 	#
> @@ -330,4 +346,12 @@
>=20
> 	&Pakfire::logger("PAKFIRE INFO: Pakfire has finished. Closing.");
>=20
> +	END {
> +		# Check if pakfire has been locked in this session.
> +		if ($locked) {
> +			# Remove lockfile.
> +			unlink($Pakfire::lockfile);
> +		}
> +	}
> +
> 	exit 0;
> --=20
> 2.20.1
>=20


--===============3988537050283783676==--