check-mirroring: 'Detected server failure' notices go to stdout, not stderr.
(imported from commit 9118b59130aaad274180c3c639ec897bc5634b9f)
This commit is contained in:
		
							parent
							
								
									08f165e3ac
								
							
						
					
					
						commit
						80075923ae
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -111,7 +111,7 @@ def send_zephyr(zwrite_args, content, retry=False):
 | 
			
		|||
                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 | 
			
		||||
    stdout, stderr = p.communicate(input=content.encode("utf-8"))
 | 
			
		||||
    if p.returncode != 0:
 | 
			
		||||
        if not retry and "Detected server failure while receiving acknowledgement for" in stderr:
 | 
			
		||||
        if not retry and "Detected server failure while receiving acknowledgement for" in stdout:
 | 
			
		||||
            logger.warning("Got server failure error sending zephyr; retrying")
 | 
			
		||||
            logger.warning(stderr)
 | 
			
		||||
            # Retry sending the message rather than bailing.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue