forked from ungleich-public/cdist
		
	Log more data.
This commit is contained in:
		
					parent
					
						
							
								8883196efb
							
						
					
				
			
			
				commit
				
					
						764ea49904
					
				
			
		
					 4 changed files with 8 additions and 4 deletions
				
			
		| 
						 | 
					@ -331,7 +331,8 @@ class Config(object):
 | 
				
			||||||
                host, remote_copy))
 | 
					                host, remote_copy))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            target_host = ipaddr.resolve_target_addresses(host)
 | 
					            target_host = ipaddr.resolve_target_addresses(host)
 | 
				
			||||||
            log.debug("target_host: {}".format(target_host))
 | 
					            log.debug("target_host for host \"{}\": {}".format(
 | 
				
			||||||
 | 
					                host, target_host))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            local = cdist.exec.local.Local(
 | 
					            local = cdist.exec.local.Local(
 | 
				
			||||||
                target_host=target_host,
 | 
					                target_host=target_host,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -179,7 +179,8 @@ class Manifest(object):
 | 
				
			||||||
                                     cdist_object.cdist_type.manifest_path)
 | 
					                                     cdist_object.cdist_type.manifest_path)
 | 
				
			||||||
        message_prefix = cdist_object.name
 | 
					        message_prefix = cdist_object.name
 | 
				
			||||||
        if os.path.isfile(type_manifest):
 | 
					        if os.path.isfile(type_manifest):
 | 
				
			||||||
            self.log.verbose("Running type manifest " + type_manifest)
 | 
					            self.log.verbose("Running type manifest %s for object %s",
 | 
				
			||||||
 | 
					                             type_manifest, cdist_object.name)
 | 
				
			||||||
            self.local.run_script(type_manifest,
 | 
					            self.local.run_script(type_manifest,
 | 
				
			||||||
                                  env=self.env_type_manifest(cdist_object),
 | 
					                                  env=self.env_type_manifest(cdist_object),
 | 
				
			||||||
                                  message_prefix=message_prefix,
 | 
					                                  message_prefix=message_prefix,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -232,7 +232,8 @@ class Local(object):
 | 
				
			||||||
            if save_output:
 | 
					            if save_output:
 | 
				
			||||||
                output, errout = exec_util.call_get_output(
 | 
					                output, errout = exec_util.call_get_output(
 | 
				
			||||||
                    command, env=env, stderr=stderr)
 | 
					                    command, env=env, stderr=stderr)
 | 
				
			||||||
                self.log.trace("Local stdout: {}".format(output))
 | 
					                self.log.trace("Command: {}; local stdout: {}".format(
 | 
				
			||||||
 | 
					                    command, output))
 | 
				
			||||||
                # Currently, stderr is not captured.
 | 
					                # Currently, stderr is not captured.
 | 
				
			||||||
                # self.log.trace("Local stderr: {}".format(errout))
 | 
					                # self.log.trace("Local stderr: {}".format(errout))
 | 
				
			||||||
                if return_output:
 | 
					                if return_output:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -309,7 +309,8 @@ class Remote(object):
 | 
				
			||||||
                stderr = None
 | 
					                stderr = None
 | 
				
			||||||
            output, errout = exec_util.call_get_output(
 | 
					            output, errout = exec_util.call_get_output(
 | 
				
			||||||
                command, env=os_environ, stderr=stderr)
 | 
					                command, env=os_environ, stderr=stderr)
 | 
				
			||||||
            self.log.trace("Remote stdout: {}".format(output))
 | 
					            self.log.trace("Command: {}; remote stdout: {}".format(
 | 
				
			||||||
 | 
					                command, output))
 | 
				
			||||||
            # Currently, stderr is not captured.
 | 
					            # Currently, stderr is not captured.
 | 
				
			||||||
            # self.log.trace("Remote stderr: {}".format(errout))
 | 
					            # self.log.trace("Remote stderr: {}".format(errout))
 | 
				
			||||||
            if return_output:
 | 
					            if return_output:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue