Liderahenk/Ahenk
1
0
Fork 0
mirror of https://github.com/Pardus-LiderAhenk/ahenk synced 2024-11-22 03:52:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "util.py: log execute command"

Browse source 
This reverts commit 037e9b3eac.
This commit is contained in:
tncyclk 2017-08-27 09:39:20 +03:00
parent 037e9b3eac
commit cc01a2a59b
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
opt/ahenk/base/util/util.py
View file

@ -12,7 +12,6 @@ import shutil
import stat import stat
import subprocess import subprocess
import uuid import uuid
from base.scope import Scope
class Util: class Util:
@ -138,11 +137,9 @@ 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)
@ -157,6 +154,16 @@ 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 = []