Projet

Général

Profil

0001-utils-capture-and-log-phantomjs-stderr-32773.patch

Frédéric Péters, 03 mai 2019 13:19

Télécharger (1,19 ko)

Voir les différences: 

Subject: [PATCH] utils: capture and log phantomjs stderr (#32773)


 mandayejs/mandaye/utils.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
mandayejs/mandaye/utils.py
37 37 
        os.path.join(settings.BASE_DIR, 'mandayejs', script)],
38 38 
        close_fds=True,
39 39 
        stdin=subprocess.PIPE,
40 
        stdout=subprocess.PIPE
40 
        stdout=subprocess.PIPE,
41 
        stderr=subprocess.STDERR
41 42 
    )
42 43 
    stdout, stderr = phantom.communicate(json.dumps(data))
43 44 

  		




  ......




  49
  50
  
    
        result = json.loads(stdout)

  		




  50
  51
  
    
    except (ValueError,):

  		




  51
  52
  
    
        result = {"result": "json_error"}

  		




  52
  
  
    
        logger.error("invalid json: %s" % stdout)

  		




  
  53
  
    
        logger.error("invalid json: %s (stderr: %s)", stdout, stderr)

  		




  53
  54
  
    

  		




  54
  55
  
    
    if result.get('stderr'):

  		




  55
  56
  
    
        logger.warning(result['stderr'])

  		




  56
  
  
    
-