/[smecontribs]/rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0.bz11171-check-min-max-start-servers.patch
ViewVC logotype

Contents of /rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0.bz11171-check-min-max-start-servers.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Tue Dec 1 14:23:26 2020 UTC (3 years, 5 months ago) by jcrisp
Branch: MAIN
CVS Tags: smeserver-nextcloud-1_2_0-7_el7_sme, smeserver-nextcloud-1_2_0-6_el7_sme, smeserver-nextcloud-1_2_0-26_el7_sme, smeserver-nextcloud-1_2_0-27_el7_sme, smeserver-nextcloud-1_2_0-22_el7_sme, smeserver-nextcloud-1_2_0-25_el7_sme, smeserver-nextcloud-1_2_0-13_el7_sme, smeserver-nextcloud-1_2_0-21_el7_sme, smeserver-nextcloud-1_2_0-12_el7_sme, smeserver-nextcloud-1_2_0-28_el7_sme, smeserver-nextcloud-1_2_0-10_el7_sme, smeserver-nextcloud-1_2_0-23_el7_sme, smeserver-nextcloud-1_2_0-20_el7_sme, smeserver-nextcloud-1_2_0-8_el7_sme, smeserver-nextcloud-1_2_0-16_el7_sme, smeserver-nextcloud-1_2_0-18_el7_sme, smeserver-nextcloud-1_2_0-15_el7_sme, smeserver-nextcloud-1_2_0-14_el7_sme, smeserver-nextcloud-1_2_0-11_el7_sme, smeserver-nextcloud-1_2_0-29_el7_sme, smeserver-nextcloud-1_2_0-9_el7_sme, smeserver-nextcloud-1_2_0-24_el7_sme, smeserver-nextcloud-1_2_0-30_el7_sme, smeserver-nextcloud-1_2_0-17_el7_sme, smeserver-nextcloud-1_2_0-19_el7_sme, HEAD 
* Tue Dec 01 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2.0-6.sme
- Add a check for the Min/Max/Start servers [SME: 11171]
- https://bugs.contribs.org/show_bug.cgi?id=11171#c4
1 diff -ruN smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud
2 --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2020-12-01 15:11:43.509587378 +0100
3 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud 2020-12-01 15:12:53.825705751 +0100
4 @@ -14,10 +14,8 @@
5 my $start_servers = $nextcloud{'PHPstartServers'} || 6;
6 my $max_spare_servers = $nextcloud{'PHPmaxServers'} || 8;
7 my $max_requests = $nextcloud{'PHPmaxRequests'} || 1000;
8 - # We probably ought to check that
9 - # min Servers <= max Servers
10 - # and
11 - # start Servers >=min and <=max
12 + $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? printf("%.0f",$max_spare_servers/2) : $min_spare_servers;
13 + $start_servers = ( $start_servers > $max_spare_servers ) ? printf("%.0f", $max_spare_servers /2 + $min_spare_servers/2 ) : $start_servers;
14
15 $OUT .=<<_EOF;
16
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed