From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] pakfire.cgi: Bring back old logic for log displaying Date: Fri, 19 Nov 2021 11:03:58 +0000 Message-ID: <861C9A9B-4FFD-4725-992F-4E7449D62C19@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7191701279956123345==" List-Id: --===============7191701279956123345== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, > On 18 Nov 2021, at 12:03, Leo Hofmann wrote: >=20 > Hi, >=20 > It is possible to refresh the log output frequently without reloading the e= ntire page, by using Javascript/Ajax: > https://www.w3schools.com/js/js_ajax_intro.asp >=20 > I'm pretty sure we could create a nice log output with Javascript. If you l= ike, I can try to implement this :) Generally I am absolutely for this, because this would much nicer. The ultima= te solution would be use web sockets and have the log streamed to the browser= without any polling. However, I am not sure whether this is the biggest priority right now. Depend= ing on how much work this is and if we can =E2=80=9Cfit it in=E2=80=9D I woul= dn=E2=80=99t object. -Michael >=20 > Best regards, > Leo >=20 > Am 16.11.2021 um 19:36 schrieb Stefan Schantl: >> Hello Bernhard, >>=20 >> thanks for pointing this out. >>=20 >> The "page refresh" is defined and performed by the following line: >>=20 >>>> &Header::openbox( 'Waiting', 1, "> content=3D'10;'>" ); << >>=20 >> 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: https://www.w3schools.com/tags/att_meta_http_equiv.asp) >>=20 >> I didn't noticed any problems with Firefox as browser on various >> linux distros. >>=20 >> 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. >>=20 >> 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. >>=20 >> Best regards, >>=20 >> -Stefan >>> Hello Stefan, >>>=20 >>> 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. :( >>>=20 >>> - Bernhard >>>=20 >>> Am 16.11.2021 um 05:47 schrieb Stefan Schantl: >>>> Hello Bernhard, >>>>=20 >>>> thanks for testing and your feedback. >>>>> Reviewed-by: Bernhard Bitsch >>>>> Tested-by: Bernhard Bitsch >>>>>=20 >>>>> 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. >>>>=20 >>>> A big thanks in advance, >>>>=20 >>>> -Stefan >>>>=20 >>>>> 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. >>>>>>=20 >>>>>> This commit switches back to the old logic which worked well in >>>>>> the >>>>>> past. >>>>>>=20 >>>>>> Signed-off-by: Stefan Schantl >>>>>> --- >>>>>> html/cgi-bin/pakfire.cgi | 57 +++++++----------------------- >>>>>> ----- >>>>>> ----- >>>>>> 1 file changed, 10 insertions(+), 47 deletions(-) >>>>>>=20 >>>>>> 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 ''; >>>>>> $cgiparams{'INSPAKS'} =3D ''; >>>>>> $cgiparams{'DELPAKS'} =3D ''; >>>>>> -my $page_lock; >>>>>> - >>>>>> sub refreshpage{&Header::openbox( 'Waiting', 1, ">>>>> equiv=3D'refresh' content=3D'1;'>" );print "
>>>>> src=3D'/images/clock.gif' alt=3D'' />
>>>>> color=3D'red'>$Lang::tr{'pagerefresh'}
";&Header:: >>>>>> clos >>>>>> ebox();} >>>>>> &Header::getcgihash(\%cgiparams); >>>>>> @@ -59,9 +57,8 @@ 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/pa >>>>>> kfire >>>>>> ", "install", "--non-interactive", "--no-colors", @pkgs); >>>>>> + sleep(1); >>>>>> } else { >>>>>> &Header::openbox("100%", "center", >>>>>> $Lang::tr{'request'}); >>>>>> my @output =3D >>>>>> &General::system_output("/usr/local/bin/pakfire", >>>>>> "resolvedeps", "- >>>>>> -no-colors", @pkgs); >>>>>> @@ -98,9 +95,8 @@ 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/pa >>>>>> kfire >>>>>> ", "remove", "--non-interactive", "--no-colors", @pkgs); >>>>>> + sleep(1); >>>>>> } else { >>>>>> &Header::openbox("100%", "center", >>>>>> $Lang::tr{'request'}); >>>>>> my @output =3D >>>>>> &General::system_output("/usr/local/bin/pakfire", >>>>>> "resolvedeps", "- >>>>>> -no-colors", @pkgs); >>>>>> @@ -136,13 +132,11 @@ END >>>>>> } >>>>>> } elsif (($cgiparams{'ACTION'} eq 'update') && (! -e >>>>>> $Pakfire::lockfile)) { >>>>>> - # Set variable to lock the page. >>>>>> - $page_lock =3D "1"; >>>>>> &General::system_background("/usr/local/bin/pakfire", >>>>>> "update", "--force", "--no-colors"); >>>>>> + sleep(1); >>>>>> } 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"); >>>>>> + sleep(1); >>>>>> } elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") { >>>>>> $pakfiresettings{"TREE"} =3D $cgiparams{"TREE"}; >>>>>> @@ -156,6 +150,7 @@ END >>>>>> # Update lists >>>>>> &General::system_background("/usr/local/bin/pa >>>>>> kfire >>>>>> ", "update", "--force", "--no-colors"); >>>>>> + sleep(1); >>>>>> } >>>>>> } >>>>>> @@ -177,44 +172,12 @@ if ($errormessage) { >>>>>> &Header::closebox(); >>>>>> } >>>>>> -# Check if a page lock is required. >>>>>> -if ($page_lock) { >>>>>> - &Header::openbox('Waiting', 1, ,); >>>>>> - print <>>>>> - >>>>>> - >>>>>> - >>>>>> - >>>>>> - >>>>>> - >>>>>> -
>>>>>> - >>>>> src=3D'/images/indicator.gif' alt=3D'$Lang::tr{'active'}' >>>>>> title=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. >>>>>> +# >>>>>> +# The system backpipe command is safe, because no user input >>>>>> is >>>>>> computed. >>>>>> +my $pid =3D `pidof pakfire`; >>>>>> -# Check if pakfire is already running. In this case a lockfile >>>>>> is >>>>>> present. >>>>>> -if (-e $Pakfire::lockfile) { >>>>>> +if ($pid) { >>>>>> &Header::openbox( 'Waiting', 1, ">>>>> equiv=3D'refresh' >>>>>> content=3D'10;'>" ); >>>>>> print <>>>>> >>>>>>=20 --===============7191701279956123345==--