diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-21 17:55:08 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-21 17:55:08 +0200 |
| commit | 8998b56a92debb423f8bec19e4953059c585b704 (patch) | |
| tree | 7def78f674d96ad584162ab1347ea6b7fa4b1cd6 /src/conf_mode/vpn_l2tp.py | |
| parent | 3f3efab7812f79e9fe9acffac0222d313344c25c (diff) | |
| download | vyos-1x-8998b56a92debb423f8bec19e4953059c585b704.tar.gz vyos-1x-8998b56a92debb423f8bec19e4953059c585b704.zip | |
vyos.util: migrate all cpu_count() occurances to common get_half_cpus()
Diffstat (limited to 'src/conf_mode/vpn_l2tp.py')
| -rwxr-xr-x | src/conf_mode/vpn_l2tp.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py index a640e2a94..d8a1fb115 100755 --- a/src/conf_mode/vpn_l2tp.py +++ b/src/conf_mode/vpn_l2tp.py @@ -25,7 +25,7 @@ from time import sleep from ipaddress import ip_network from vyos.config import Config -from vyos.util import call +from vyos.util import call, get_half_cpus from vyos.validate import is_ipv4 from vyos import ConfigError from vyos.template import render @@ -65,7 +65,7 @@ default_config_data = { 'radius_dynamic_author': '', 'wins': [], 'ip6_column': [], - 'thread_cnt': 1 + 'thread_cnt': get_half_cpus() } def get_config(): @@ -77,10 +77,6 @@ def get_config(): conf.set_level(base_path) l2tp = deepcopy(default_config_data) - cpu = os.cpu_count() - if cpu > 1: - l2tp['thread_cnt'] = int(cpu/2) - ### general options ### if conf.exists(['name-server']): for name_server in conf.return_values(['name-server']): |