From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] pakfire.cgi: Implement logic to lock the page until pakfire has been fully launched. Date: Wed, 10 Nov 2021 08:56:30 +0000 Message-ID: <4A60896C-338B-4B88-92E3-B46C9BF93748@ipfire.org> In-Reply-To: <128FA007-F5DE-4A59-901D-6FFA85360636@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1588377602579311814==" List-Id: --===============1588377602579311814== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, I had a brief phone call with Stefan yesterday where he said that he was goin= g to have a look at this again. In the meantime he said that the patch can be shipped because it does not bre= ak anything, although it doesn=E2=80=99t solve the problem it was meant to so= lve either. Can everybody confirm this? -Michael > On 5 Nov 2021, at 19:10, Jon Murphy wrote: >=20 > In Core Update 161 (testing): Same issue. I see the spin and Pakfire is w= orking . . . but no messages. >=20 > IPFire 2.27 (x86_64) - Core Update 161 Development Build: master/191347cc >=20 > Jon >=20 >=20 >> On Oct 21, 2021, at 5:17 AM, Bernhard Bitsch wrote: >>=20 >> Reviewed-by: Bernhard Bitsch >>=20 >> The locking is functioning. >> But the excerpt of /var/log/messages isn't displayed. >>=20 >> Am 18.10.2021 um 21:09 schrieb Stefan Schantl: >>> When performing any action which requires pakfire, the page gets locked >>> with an message informing the user that pakfire is working. The page >>> will be reloaded when pakfire has been launched and is doing the >>> requested operation - showing the well known log output. This also >>> happens when pakfire has been launched via any kind of terminal or SSH >>> session and the CGI gets accessed. >>> Internally before pakfire gets started a variable called page_lock will >>> be set to lock the page. An while loop will keep the page locked until >>> pakfire is launched fully and has written it's lock_file. >>> This approach will prevent us from any kind of required time intervall >>> or race conditions. >>> Signed-off-by: Stefan Schantl >>> --- >>> html/cgi-bin/pakfire.cgi | 49 ++++++++++++++++++++++++++++++++++++++-- >>> 1 file changed, 47 insertions(+), 2 deletions(-) >>> diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi >>> index 0cf522ba1..f2381f031 100644 >>> --- a/html/cgi-bin/pakfire.cgi >>> +++ b/html/cgi-bin/pakfire.cgi >>> @@ -44,6 +44,8 @@ $cgiparams{'VALID'} =3D ''; >>> $cgiparams{'INSPAKS'} =3D ''; >>> $cgiparams{'DELPAKS'} =3D ''; >>> +my $page_lock; >>> + >>> sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "
3D=
$Lang::tr{'pagerefresh'}
";&Head= er::closebox();} >>> &Header::getcgihash(\%cgiparams); >>> @@ -57,8 +59,9 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, ">> if (($cgiparams{'ACTION'} eq 'install') && (! -e $Pakfire::lockfile)) { >>> my @pkgs =3D split(/\|/, $cgiparams{'INSPAKS'}); >>> if ("$cgiparams{'FORCE'}" eq "on") { >>> + # Lock the page. >>> + $page_lock =3D "1"; >>> &General::system_background("/usr/local/bin/pakfire", "install", "--no= n-interactive", "--no-colors", @pkgs); >>> - sleep(2); >>> } else { >>> &Header::openbox("100%", "center", $Lang::tr{'request'}); >>> my @output =3D &General::system_output("/usr/local/bin/pakfire", "reso= lvedeps", "--no-colors", @pkgs); >>> @@ -95,8 +98,9 @@ END >>> } elsif (($cgiparams{'ACTION'} eq 'remove') && (! -e $Pakfire::lockfile)= ) { >>> my @pkgs =3D split(/\|/, $cgiparams{'DELPAKS'}); >>> if ("$cgiparams{'FORCE'}" eq "on") { >>> + # Lock the page. >>> + $page_lock =3D "1"; >>> &General::system_background("/usr/local/bin/pakfire", "remove", "--non= -interactive", "--no-colors", @pkgs); >>> - sleep(2); >>> } else { >>> &Header::openbox("100%", "center", $Lang::tr{'request'}); >>> my @output =3D &General::system_output("/usr/local/bin/pakfire", "reso= lvedeps", "--no-colors", @pkgs); >>> @@ -132,8 +136,12 @@ END >>> } >>> } elsif (($cgiparams{'ACTION'} eq 'update') && (! -e $Pakfire::lockfil= e)) { >>> + # Set variable to lock the page. >>> + $page_lock =3D "1"; >>> &General::system_background("/usr/local/bin/pakfire", "update", "--forc= e", "--no-colors"); >>> } elsif (($cgiparams{'ACTION'} eq 'upgrade') && (!-e $Pakfire::lockfile)= ) { >>> + # Lock the page. >>> + $page_lock =3D "1"; >>> &General::system_background("/usr/local/bin/pakfire", "upgrade", "-y", = "--no-colors"); >>> } elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") { >>> $pakfiresettings{"TREE"} =3D $cgiparams{"TREE"}; >>> @@ -169,6 +177,43 @@ if ($errormessage) { >>> &Header::closebox(); >>> } >>> +# Check if a page lock is required. >>> +if ($page_lock) { >>> + &Header::openbox('Waiting', 1, ,); >>> + print <>> + >>> + >>> + >>> + >>> + >>> + >>> +
>>> + 3D'$Lang::tr{'active'}' >>> + >>> + $Lang::tr{'pakfire working'} >>> +
>>> +END >>> + &Header::closebox(); >>> + >>> + # Infinite loop to lock the page until pakfire lockfile is present. >>> + while($page_lock) { >>> + unless (-e $Pakfire::lockfile) { >>> + sleep(1); >>> + } else { >>> + # Release page lock. >>> + undef($page_lock); >>> + >>> + # Break loop. >>> + last; >>> + } >>> + } >>> + >>> + # Perform page reload. >>> + print "\n"; >>> + exit; >>> +} >>> + >>> +# Check if pakfire is already running. In this case a lockfile is presen= t. >>> if (-e $Pakfire::lockfile) { >>> &Header::openbox( 'Waiting', 1, "" ); >>> print <=20 --===============1588377602579311814==--