From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Hofmann <hofmann@leo-andres.de>
To: development@lists.ipfire.org
Subject: Re: [PATCH] pakfire.cgi: Bring back old logic for log displaying
Date: Thu, 18 Nov 2021 13:03:40 +0100
Message-ID: <ced7a230-831d-09b8-98cf-ac4b1d0169f8@leo-andres.de>
In-Reply-To: <0417b6a1637eff70598dccdc7dbbf9380a683f56.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5668522601053839294=="
List-Id: <development.lists.ipfire.org>

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

Hi,

It is possible to refresh the log output frequently without reloading the ent=
ire page, by using Javascript/Ajax:
https://www.w3schools.com/js/js_ajax_intro.asp

I'm pretty sure we could create a nice log output with Javascript. If you lik=
e, I can try to implement this :)

Best regards,
Leo

Am 16.11.2021 um 19:36 schrieb Stefan Schantl:
> Hello Bernhard,
>
> thanks for pointing this out.
>
> The "page refresh" is defined and performed by the following line:
>
>>> &Header::openbox( 'Waiting', 1, "<meta http-equiv=3D'refresh'
> content=3D'10;'>" ); <<
>
> This kind of refresh logic is untouched and worked well since many
> years. The "http-equiv" tells the browser to do a refresh of the page
> and the content contains the amount in seconds to wait. (See more
> here:=C2=A0https://www.w3schools.com/tags/att_meta_http_equiv.asp)
>
> I didn't noticed any problems with Firefox as browser on various
> linux distros.
>
> A very easy test would be to decrease the time interval (minimum is
> "1") to force more periodic page reloads and check if the log output go
> further.
>
> If everything works well we may need to think about a new interval
> value because 10 seconds nowadays may be to long for the high speed
> hardware out there.
>
> Best regards,
>
> -Stefan
>> Hello Stefan,
>>
>> the logs are only displayed once ( the last 20 lines ).
>> The aim of the change was a refreshing of this log to show the
>> progress
>> of the pakfire function, if I remember right.
>> I tried to implement this, but with no success. :(
>>
>> - Bernhard
>>
>> Am 16.11.2021 um 05:47 schrieb Stefan Schantl:
>>> Hello Bernhard,
>>>
>>> thanks for testing and your feedback.
>>>> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
>>>> Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
>>>>
>>>> Okay, the old behaviour is reinstalled. Remains the problem with
>>>> the
>>>> page reload.
>>> I'm sorry I do not exactly understand which problem do you mean
>>> here -
>>> please provide some more details.
>>>
>>> A big thanks in advance,
>>>
>>> -Stefan
>>>
>>>> Am 15.11.2021 um 21:23 schrieb Stefan Schantl:
>>>>> Trying to get rid of the system backpipe check if a pakfire is
>>>>> running
>>>>> does not work very well. It simply makes the code more complex
>>>>> and
>>>>> only introduced some new problems.
>>>>>
>>>>> This commit switches back to the old logic which worked well in
>>>>> the
>>>>> past.
>>>>>
>>>>> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
>>>>> ---
>>>>>  =C2=A0=C2=A0 html/cgi-bin/pakfire.cgi | 57 +++++++--------------------=
---
>>>>> -----
>>>>> -----
>>>>>  =C2=A0=C2=A0 1 file changed, 10 insertions(+), 47 deletions(-)
>>>>>
>>>>> diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-
>>>>> bin/pakfire.cgi
>>>>> index f2381f031..4d6eee284 100644
>>>>> --- a/html/cgi-bin/pakfire.cgi
>>>>> +++ b/html/cgi-bin/pakfire.cgi
>>>>> @@ -44,8 +44,6 @@ $cgiparams{'VALID'} =3D '';
>>>>>  =C2=A0=C2=A0 $cgiparams{'INSPAKS'} =3D '';
>>>>>  =C2=A0=C2=A0 $cgiparams{'DELPAKS'} =3D '';
>>>>>    =20
>>>>> -my $page_lock;
>>>>> -
>>>>>  =C2=A0=C2=A0 sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta ht=
tp-
>>>>> equiv=3D'refresh' content=3D'1;'>" );print "<center><img
>>>>> src=3D'/images/clock.gif' alt=3D'' /><br/><font
>>>>> color=3D'red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::
>>>>> clos
>>>>> ebox();}
>>>>>    =20
>>>>>  =C2=A0=C2=A0 &Header::getcgihash(\%cgiparams);
>>>>> @@ -59,9 +57,8 @@ sub refreshpage{&Header::openbox( 'Waiting',
>>>>> 1,
>>>>> "<meta http-equiv=3D'refresh' cont
>>>>>  =C2=A0=C2=A0 if (($cgiparams{'ACTION'} eq 'install') && (! -e
>>>>> $Pakfire::lockfile)) {
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0my @pkgs =3D spl=
it(/\|/, $cgiparams{'INSPAKS'});
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if ("$cgiparams{=
'FORCE'}" eq "on") {
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0# Lock the page.
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0$page_lock =3D "1";
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&General::system_background("/usr/local/bin/=
pa
>>>>> kfire
>>>>> ", "install", "--non-interactive", "--no-colors", @pkgs);
>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0sleep(1);
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} else {
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&Header::openbox("100%", "center",
>>>>> $Lang::tr{'request'});
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0my @output =3D
>>>>> &General::system_output("/usr/local/bin/pakfire",
>>>>> "resolvedeps", "-
>>>>> -no-colors", @pkgs);
>>>>> @@ -98,9 +95,8 @@ END
>>>>>  =C2=A0=C2=A0 } elsif (($cgiparams{'ACTION'} eq 'remove') && (! -e
>>>>> $Pakfire::lockfile)) {
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0my @pkgs =3D spl=
it(/\|/, $cgiparams{'DELPAKS'});
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if ("$cgiparams{=
'FORCE'}" eq "on") {
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0# Lock the page.
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0$page_lock =3D "1";
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&General::system_background("/usr/local/bin/=
pa
>>>>> kfire
>>>>> ", "remove", "--non-interactive", "--no-colors", @pkgs);
>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0sleep(1);
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} else {
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&Header::openbox("100%", "center",
>>>>> $Lang::tr{'request'});
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0my @output =3D
>>>>> &General::system_output("/usr/local/bin/pakfire",
>>>>> "resolvedeps", "-
>>>>> -no-colors", @pkgs);
>>>>> @@ -136,13 +132,11 @@ END
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
>>>>>    =20
>>>>>  =C2=A0=C2=A0 } elsif (($cgiparams{'ACTION'} eq 'update') && (! -e
>>>>> $Pakfire::lockfile)) {
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# Set variable to lock the p=
age.
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0$page_lock =3D "1";
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&General::system=
_background("/usr/local/bin/pakfire",
>>>>> "update", "--force", "--no-colors");
>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sleep(1);
>>>>>  =C2=A0=C2=A0 } elsif (($cgiparams{'ACTION'} eq 'upgrade') && (!-e
>>>>> $Pakfire::lockfile)) {
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# Lock the page.
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0$page_lock =3D "1";
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&General::system=
_background("/usr/local/bin/pakfire",
>>>>> "upgrade", "-y", "--no-colors");
>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sleep(1);
>>>>>  =C2=A0=C2=A0 } elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0$pakfiresettings=
{"TREE"} =3D $cgiparams{"TREE"};
>>>>>    =20
>>>>> @@ -156,6 +150,7 @@ END
>>>>>    =20
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# Update lists
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&General::system_background("/usr/local/bin/=
pa
>>>>> kfire
>>>>> ", "update", "--force", "--no-colors");
>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0sleep(1);
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
>>>>>  =C2=A0=C2=A0 }
>>>>>    =20
>>>>> @@ -177,44 +172,12 @@ if ($errormessage) {
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&Header::closebo=
x();
>>>>>  =C2=A0=C2=A0 }
>>>>>    =20
>>>>> -# Check if a page lock is required.
>>>>> -if ($page_lock) {
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&Header::openbox('Waiting', =
1, ,);
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0print <<END;
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0<table>
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<tr>
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<td>
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0<img
>>>>> src=3D'/images/indicator.gif' alt=3D'$Lang::tr{'active'}'
>>>>> title=3D'$Lang::tr{'active'}'>
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0</td>
>>>>> -
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<td>
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0$Lang::tr{'pakfire
>>>>> working'}
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0</td>
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0</tr>
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0</table>
>>>>> -END
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&Header::closebox();
>>>>> -
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# Infinite loop to lock the =
page until pakfire lockfile
>>>>> is
>>>>> present.
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0while($page_lock) {
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0unless (-e $Pakfire::lockfile) {
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sleep(1);
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0} else {
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# Releas=
e page lock.
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0undef($p=
age_lock);
>>>>> -
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# Break =
loop.
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0last;
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0}
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
>>>>> -
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# Perform page reload.
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0print "<meta http-equiv=3D'r=
efresh' content=3D'1;'>\n";
>>>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0exit;
>>>>> -}
>>>>> +# Check if pakfire is already running.
>>>>> +#
>>>>> +# The system backpipe command is safe, because no user input
>>>>> is
>>>>> computed.
>>>>> +my $pid =3D `pidof pakfire`;
>>>>>    =20
>>>>> -# Check if pakfire is already running. In this case a lockfile
>>>>> is
>>>>> present.
>>>>> -if (-e $Pakfire::lockfile) {
>>>>> +if ($pid) {
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&Header::openbox=
( 'Waiting', 1, "<meta http-
>>>>> equiv=3D'refresh'
>>>>> content=3D'10;'>" );
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0print <<END;
>>>>>  =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<table>
>>>>>

--===============5668522601053839294==--