From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel =?utf-8?q?Weism=C3=BCller?= <daniel.weismueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] BUG 11786 - squid: Remove setting for filter processes the
 number of Squid processes
Date: Tue, 30 Oct 2018 12:06:59 +0100
Message-ID: <20181030110659.1517-1-daniel.weismueller@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2905194421019198238=="
List-Id: <development.lists.ipfire.org>

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

I added a function to determine the number of cores.
Now the number of squid processes will be equal to the number of logical core=
s.
Further I removed the possibility of changing the number
of squid processes in the proxy.cgi

Signed-off-by: Daniel Weism=C3=BCller <daniel.weismueller(a)ipfire.org>
---
 config/cfgroot/general-functions.pl |  7 +++++++
 html/cgi-bin/proxy.cgi              | 16 ++--------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun=
ctions.pl
index 0577afe28..e8495e885 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -1165,5 +1165,12 @@ sub dnssec_status() {
=20
 	return $status;
 }
+sub number_cpu_cores() {
+	open my $cpuinfo, "/proc/cpuinfo" or die "Can't open cpuinfo: $!\n";
+	my $cores =3D scalar (map /^processor/, <$cpuinfo>);
+	close $cpuinfo;
+
+	return $cores;
+}
=20
 1;
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 738425b9a..92bebfe18 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -287,7 +287,6 @@ $proxysettings{'IDENT_USER_ACL'} =3D 'positive';
 $proxysettings{'ENABLE_FILTER'} =3D 'off';
 $proxysettings{'ENABLE_UPDXLRATOR'} =3D 'off';
 $proxysettings{'ENABLE_CLAMAV'} =3D 'off';
-$proxysettings{'CHILDREN'} =3D '10';
=20
 $ncsa_buttontext =3D $Lang::tr{'advproxy NCSA create user'};
=20
@@ -437,11 +436,6 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || (=
$proxysettings{'ACTION'}
 		$errormessage =3D $Lang::tr{'invalid maximum incoming size'};
 		goto ERROR;
 	}
-		if (!($proxysettings{'CHILDREN'} =3D~ /^\d+$/) || ($proxysettings{'CHILDRE=
N'} < 1))
-	{
-		$errormessage =3D $Lang::tr{'advproxy invalid num of children'};
-		goto ERROR;
-	}
 	if ($proxysettings{'ENABLE_BROWSER_CHECK'} eq 'on')
 	{
 		$browser_regexp =3D '';
@@ -1034,12 +1028,8 @@ print <<END
 </table>
 <hr size=3D'1'>
 <table width=3D'100%'>
-<tr><td class=3D'base' colspan=3D'4'><b>$Lang::tr{'advproxy redirector child=
ren'}</b></td></tr>
-<tr><td class=3D'base' >$Lang::tr{'processes'}:&nbsp;<img src=3D'/blob.gif' =
alt=3D'*' /><input type=3D'text' name=3D'CHILDREN' value=3D'$proxysettings{'C=
HILDREN'}' size=3D'5' /></td>
 END
 ;
-my $count =3D `ip n| wc -l`;
-if ( $count < 1 ){$count =3D 1;}
 if ( -e "/usr/bin/squidclamav" ) {
 	print "<td class=3D'base'><b>".$Lang::tr{'advproxy squidclamav'}."</b><br /=
>";
 	if ( ! -e "/var/run/clamav/clamd.pid" ){
@@ -1048,18 +1038,16 @@ if ( -e "/usr/bin/squidclamav" ) {
 		}
 	else {
 		print $Lang::tr{'advproxy enabled'}."<input type=3D'checkbox' name=3D'ENAB=
LE_CLAMAV' ".$checked{'ENABLE_CLAMAV'}{'on'}." /><br />";
-		print "+ ".int(( $count**(1/3)) * 8);}
+}
 	print "</td>";
 } else {
 	print "<td></td>";
 }
 print "<td class=3D'base'><a href=3D'/cgi-bin/urlfilter.cgi'><b>".$Lang::tr{=
'advproxy url filter'}."</a></b><br />";
 print $Lang::tr{'advproxy enabled'}."<input type=3D'checkbox' name=3D'ENABLE=
_FILTER' ".$checked{'ENABLE_FILTER'}{'on'}." /><br />";
-print "+ ".int(($count**(1/3)) * 6);
 print "</td>";
 print "<td class=3D'base'><a href=3D'/cgi-bin/updatexlrator.cgi'><b>".$Lang:=
:tr{'advproxy update accelerator'}."</a></b><br />";
 print $Lang::tr{'advproxy enabled'}."<input type=3D'checkbox' name=3D'ENABLE=
_UPDXLRATOR' ".$checked{'ENABLE_UPDXLRATOR'}{'on'}." /><br />";
-print "+ ".int(($count**(1/3)) * 5);
 print "</td></tr>";
 print <<END
 </table>
@@ -4095,7 +4083,7 @@ END
 	if (($proxysettings{'ENABLE_FILTER'} eq 'on') || ($proxysettings{'ENABLE_UP=
DXLRATOR'} eq 'on') || ($proxysettings{'ENABLE_CLAMAV'} eq 'on'))
 	{
 		print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
-		print FILE "url_rewrite_children $proxysettings{'CHILDREN'}\n\n";
+		print FILE "url_rewrite_children ", &General::number_cpu_cores(), "\n\n";
 	}
=20
 	# Include file with user defined settings.
--=20
2.12.2


--===============2905194421019198238==--