opengnsys
/
ogagent
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Bug fixed when out and err are None in operation exec_command

oglive^2^2^2
Juan Manuel Bardallo 2019-05-27 10:48:30 +02:00 committed by Ramón M. Gómez
parent a5117cbf55
commit d0a7766b08
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/opengnsys/oglive/operations.py
View File

@ -41,6 +41,7 @@ import array
import six import six
import chardet import chardet
from opengnsys import utils from opengnsys import utils
from opengnsys.log import logger
def _getMacAddr(ifname): def _getMacAddr(ifname):
@ -209,9 +210,20 @@ def exec_command(cmd):
""" """
proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(out, err) = proc.communicate() (out, err) = proc.communicate()
try:
if out is not None:
encoding = chardet.detect(out)["encoding"]
if encoding is not None:
out = out.decode(encoding).encode("utf8")
if err is not None:
encoding = chardet.detect(err)["encoding"]
if encoding is not None:
err = err.decode(encoding).encode("utf8")
except Exception as e:
logger.debug("ERROR EXEC COMMAND: {}".format(str(e)))
stat = proc.returncode stat = proc.returncode
return stat, out.decode(chardet.detect(out)['encoding']).encode('utf8'),\ return stat, out, err
err.decode(chardet.detect(err)['encoding']).encode('utf8')
def get_hardware(): def get_hardware():