Revision c3d7f69b daemons/ganeti-noded

b/daemons/ganeti-noded
80 80 
    except errors.QuitGanetiException, err:
81 81 
      global _EXIT_GANETI_NODED
82 82 
      _EXIT_GANETI_NODED = True
83 
      if isinstance(err, tuple) and len(err) == 2:
84 
        if err[0]:
83 
      if isinstance(err.args, tuple) and len(err.args) == 2:
84 
        if err.args[0]:
85 85 
          self.send_error(500, "Error: %s" % str(err[1]))
86 86 
        else:
87 
          payload = simplejson.dumps(err[1])
87 
          payload = simplejson.dumps(err.args[1])
88 88 
      else:
89 
        self.log_message('GanetiQuitException Usage Error')
89 
        self.log_message('QuitGanetiException Usage Error')
90 90 
        self.send_error(500, "Error: %s" % str(err))
91 91 
    except Exception, err:
92 92 
      self.send_error(500, "Error: %s" % str(err))

Also available in: Unified diff