mirror of
https://github.com/Pardus-LiderAhenk/ahenk
synced 2024-11-22 02:42:16 +03:00
util.py: log execute command
This commit is contained in:
parent
e02d8a3c4f
commit
037e9b3eac
1 changed files with 3 additions and 10 deletions
|
@ -12,6 +12,7 @@ import shutil
|
||||||
import stat
|
import stat
|
||||||
import subprocess
|
import subprocess
|
||||||
import uuid
|
import uuid
|
||||||
|
from base.scope import Scope
|
||||||
|
|
||||||
|
|
||||||
class Util:
|
class Util:
|
||||||
|
@ -137,9 +138,11 @@ class Util:
|
||||||
try:
|
try:
|
||||||
if ip:
|
if ip:
|
||||||
command = 'ssh root@{0} "{1}"'.format(ip, command)
|
command = 'ssh root@{0} "{1}"'.format(ip, command)
|
||||||
|
Scope.get_instance().get_logger().debug('Executing command: ' +str(command))
|
||||||
|
|
||||||
elif as_user:
|
elif as_user:
|
||||||
command = 'su - {0} -c "{1}"'.format(as_user, command)
|
command = 'su - {0} -c "{1}"'.format(as_user, command)
|
||||||
|
Scope.get_instance().get_logger().debug('Executing command: ' + str(command))
|
||||||
process = subprocess.Popen(command, stdin=stdin, env=env, cwd=cwd, stderr=subprocess.PIPE,
|
process = subprocess.Popen(command, stdin=stdin, env=env, cwd=cwd, stderr=subprocess.PIPE,
|
||||||
stdout=subprocess.PIPE, shell=shell)
|
stdout=subprocess.PIPE, shell=shell)
|
||||||
|
|
||||||
|
@ -154,16 +157,6 @@ class Util:
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return 1, 'Could not execute command: {0}. Error Message: {1}'.format(command, str(e)), ''
|
return 1, 'Could not execute command: {0}. Error Message: {1}'.format(command, str(e)), ''
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def scopy_from_remote(source_path, destination_path, ip):
|
|
||||||
command = 'scp -r root@' + ip + ':' + source_path + ' ' + destination_path
|
|
||||||
process = subprocess.Popen(command, stderr=subprocess.PIPE,stdout=subprocess.PIPE, shell=True)
|
|
||||||
result_code = process.wait()
|
|
||||||
p_out = process.stdout.read().decode("unicode_escape")
|
|
||||||
p_err = process.stderr.read().decode("unicode_escape")
|
|
||||||
|
|
||||||
return result_code, p_out, p_err
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def execute_script(script_path, parameters=None):
|
def execute_script(script_path, parameters=None):
|
||||||
command = []
|
command = []
|
||||||
|
|
Loading…
Reference in a new issue