diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2009-03-11 21:40:31 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2009-03-11 21:40:43 -0400 |
commit | d9acea752bfc4390e306764d2fbfbfdc2857cf52 (patch) | |
tree | 606ef30a47546bf7f7d360d6181d48947a038e4f | |
parent | 6e8bd1b0aba7e27417f6245c284873d511785952 (diff) | |
download | pfsense-d9acea752bfc4390e306764d2fbfbfdc2857cf52.zip pfsense-d9acea752bfc4390e306764d2fbfbfdc2857cf52.tar.gz |
Use nice -n20 for common launched items
-rw-r--r-- | conf.default/config.xml | 8 | ||||
-rw-r--r-- | etc/inc/config.inc | 4 | ||||
-rw-r--r-- | etc/inc/rrd.inc | 4 | ||||
-rw-r--r-- | etc/inc/system.inc | 3 | ||||
-rw-r--r-- | usr/local/www/status_rrd_graph_img.php | 4 |
5 files changed, 13 insertions, 10 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml index d5ce3be..805f593 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -752,7 +752,7 @@ <month>*</month> <wday>*</wday> <who>root</who> - <command>/usr/local/bin/checkreload.sh</command> + <command>/usr/bin/nice -n20 /usr/local/bin/checkreload.sh</command> </item> <item> <minute>*/5</minute> @@ -761,7 +761,7 @@ <month>*</month> <wday>*</wday> <who>root</who> - <command>/etc/ping_hosts.sh</command> + <command>/usr/bin/nice -n20 /etc/ping_hosts.sh</command> </item> <item> <minute>*/140</minute> @@ -770,7 +770,7 @@ <month>*</month> <wday>*</wday> <who>root</who> - <command>/usr/local/sbin/reset_slbd.sh</command> + <command>/usr/bin/nice -n20 /usr/local/sbin/reset_slbd.sh</command> </item> </cron> <wol> @@ -785,4 +785,4 @@ <rrd> <enable/> </rrd> -</pfsense> +</pfsense>
\ No newline at end of file diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 00a2e7b..20178af 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -2057,7 +2057,7 @@ endif; $listtags = array("ds", "v", "rra", "row"); $rrddbpath = "/var/db/rrd/"; - $rrdtool = "/usr/local/bin/rrdtool"; + $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; $rrdinterval = 60; $valid = $rrdinterval * 2; @@ -3080,4 +3080,4 @@ function set_device_perms() { if($g['booting']) echo "."; $config = parse_config(); -?> +?>
\ No newline at end of file diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc index 5326c1a..1d02970 100644 --- a/etc/inc/rrd.inc +++ b/etc/inc/rrd.inc @@ -34,7 +34,7 @@ require_once("notices.inc"); require_once("globals.inc"); function dump_rrd_to_xml($rrddatabase, $xmldumpfile) { - $rrdtool = "/usr/local/bin/rrdtool"; + $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; if(file_exists($xmldumpfile)) exec("rm {$xmldumpfile}"); @@ -170,7 +170,7 @@ function enable_rrd_graphing() { $proc = "-processor.rrd"; $mem = "-memory.rrd"; - $rrdtool = "/usr/local/bin/rrdtool"; + $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; $netstat = "/usr/bin/netstat"; $awk = "/usr/bin/awk"; $tar = "/usr/bin/tar"; diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 0ecab7d..6afcc9b 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -716,6 +716,9 @@ server.modules = ( # "mod_cgi", # "mod_accesslog" +server.max-keep-alive-requests = 15 +server.max-keep-alive-idle = 30 + ## a static document-root, for virtual-hosting take look at the ## server.virtual-* options server.document-root = "{$document_root}" diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 556f158..9883e3f 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -99,7 +99,7 @@ $scale = $graphs[$interval]['scale']; $rrddbpath = "/var/db/rrd/"; $rrdtmppath = "/tmp/"; -$rrdtool = "/usr/local/bin/rrdtool"; +$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; $uptime = "/usr/bin/uptime"; $sed = "/usr/bin/sed"; @@ -846,4 +846,4 @@ if(($graphcmdreturn <> 0) || (! $data)) { } } -?> +?>
\ No newline at end of file |