Revision ab221ddf daemons/ganeti-noded

b/daemons/ganeti-noded
45 45
from ganeti import http
46 46
from ganeti import utils
47 47
from ganeti import storage
48
from ganeti import serializer
48 49

  
49 50
import ganeti.http.server # pylint: disable-msg=W0611
50 51

  
......
99 100
      raise http.HttpNotFound()
100 101

  
101 102
    try:
102
      rvalue = method(req.request_body)
103
      return True, rvalue
103
      result = (True, method(serializer.LoadJson(req.request_body)))
104 104

  
105 105
    except backend.RPCFail, err:
106 106
      # our custom failure exception; str(err) works fine if the
107 107
      # exception was constructed with a single argument, and in
108 108
      # this case, err.message == err.args[0] == str(err)
109
      return (False, str(err))
109
      result = (False, str(err))
110 110
    except errors.QuitGanetiException, err:
111 111
      # Tell parent to quit
112 112
      logging.info("Shutting down the node daemon, arguments: %s",
......
114 114
      os.kill(self.noded_pid, signal.SIGTERM)
115 115
      # And return the error's arguments, which must be already in
116 116
      # correct tuple format
117
      return err.args
117
      result = err.args
118 118
    except Exception, err:
119 119
      logging.exception("Error in RPC call")
120
      return False, "Error while executing backend function: %s" % str(err)
120
      result = (False, "Error while executing backend function: %s" % str(err))
121

  
122
    return serializer.DumpJson(result, indent=False)
121 123

  
122 124
  # the new block devices  --------------------------
123 125

  

Also available in: Unified diff