lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(configd) flush script output to tempfile to avoid the use of subprocess.check_output which can be slow on some platforms.

Browse Source
This commit is contained in:
Ad Schellevis 2015-06-08 19:06:53 +02:00
parent 952e010b9d
commit 39d99e60ed
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/opnsense/service/modules/processhandler.py
View File

@ -45,6 +45,7 @@ import glob
import time
import uuid
import shlex
import tempfile
import ph_inline_actions
from modules import singleton
@ -429,8 +430,12 @@ class Action(object):
return 'Execute error'
elif self.type.lower() == 'script_output':
try:
script_output = subprocess.check_output(script_command, env=self.config_environment, shell=True)
return script_output
with tempfile.NamedTemporaryFile() as output_stream:
subprocess.check_call(script_command, env=self.config_environment, shell=True,
stdout=output_stream, stderr=subprocess.STDOUT)
output_stream.seek(0)
script_output = output_stream.read()
return script_output
except:
syslog.syslog(syslog.LOG_ERR, '[%s] Script action failed at %s' % (message_uuid,
traceback.format_exc()))