nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

samba: Improve actions script startup time

Browse Source 
Speedup actions script startup time from 3.6s to 0.45s on
A20-OLinuXino-LIME2 hardware, improve top three slowest imports:
- don't import constant from manifest (saves 2.7s)
- defer importing actions_utils and augeas (saves 0.3s + 0.15s)

Signed-off-by: Veiko Aasa <veiko17@disroot.org>
Reviewed-by: Joseph Nuthalapati <njoseph@riseup.net>
This commit is contained in:
Veiko Aasa 2020-01-07 16:45:02 +02:00 committed by Joseph Nuthalapati
parent 92d8d4fb3a
commit 66b57d48cf
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/samba
View File

@ -27,10 +27,7 @@ import shutil
import stat import stat
import subprocess import subprocess
import augeas SHARES_CONF_BACKUP_FILE = '/var/lib/plinth/backups-data/samba-shares-dump.conf'
from plinth import action_utils
from plinth.modules.samba.manifest import SHARES_CONF_BACKUP_FILE
DEFAULT_FILE = '/etc/default/samba' DEFAULT_FILE = '/etc/default/samba'
CONF_PATH = '/etc/samba/smb-freedombox.conf' CONF_PATH = '/etc/samba/smb-freedombox.conf'
@ -264,6 +261,7 @@ def _set_open_share_permissions(directory):
def _use_config_file(conf_file): def _use_config_file(conf_file):
"""Set samba configuration file location.""" """Set samba configuration file location."""
import augeas
aug = augeas.Augeas( aug = augeas.Augeas(
flags=augeas.Augeas.NO_LOAD + augeas.Augeas.NO_MODL_AUTOLOAD) flags=augeas.Augeas.NO_LOAD + augeas.Augeas.NO_MODL_AUTOLOAD)
aug.set('/augeas/load/Shellvars/lens', 'Shellvars.lns') aug.set('/augeas/load/Shellvars/lens', 'Shellvars.lns')
@ -327,6 +325,7 @@ def subcommand_get_users(_):
def subcommand_setup(_): def subcommand_setup(_):
"""Configure samba, use custom samba config file.""" """Configure samba, use custom samba config file."""
from plinth import action_utils
with open(CONF_PATH, 'w') as file_handle: with open(CONF_PATH, 'w') as file_handle:
file_handle.write(CONF) file_handle.write(CONF)
_use_config_file(CONF_PATH) _use_config_file(CONF_PATH)