FCL/sftools/depl/swconfigmdw: comparison configurationengine/source/plugins/common/ConeCommandPlugin/commandplugin/commandml.py

equal deleted inserted replaced

-:e7e0ae78773e
+:0951727b8815
 import re
 import os
 import logging
 import types
 import pkg_resources
+import sys
 import subprocess
 from cone.public import plugin,utils
 def get_folder_set(folder):
 self.shell = False
 self.bufsize = 0
 self.cwd = None
 self.envs = None
 self.arguments = []
-self.pipes = {}
+self.pipes = {'stdout': subprocess.PIPE, 'stderr': subprocess.PIPE}
 self.streams = {}
 self.filters = []
 self.logger = None
 self.dview = None
 % (self.shell, self.envs, cwd, self.bufsize, \
 self.get_pipe("stdin", 'r'),self.get_pipe("stdout"), self.get_pipe("stderr")))
 pid = subprocess.Popen(command_str, shell=self.shell, env=env_dict, cwd=cwd,\
 bufsize=self.bufsize, stdin = self.get_pipe("stdin", 'r'),\
 stdout = self.get_pipe("stdout"), stderr = self.get_pipe("stderr"))
+#log stdout and stderr to logger
+stdout_value, stderr_value = pid.communicate()
+if stdout_value != None: self.logger.info("stdout: %s" % stdout_value)
+if stderr_value != None: self.logger.warning("stderr: %s" % stderr_value)
 #Waiting for process to complete
 retcode = pid.wait()
 #Storing stream information for possible further processing.
 self.set_streams(pid.stdin, pid.stdout, pid.stderr)
 if retcode < 0:
 self.logger.error("Child was terminated by signal %s" % (-retcode))

changeset 4	0951727b8815
parent 3	e7e0ae78773e