Revision dd36d829

b/daemons/ganeti-masterd
36 36
import Queue
37 37
import random
38 38
import signal
39
import simplejson
40 39
import logging
41 40

  
42 41
from cStringIO import StringIO
......
55 54
from ganeti import workerpool
56 55
from ganeti import rpc
57 56
from ganeti import bootstrap
57
from ganeti import serializer
58 58

  
59 59

  
60 60
CLIENT_REQUEST_WORKERS = 16
......
152 152
        logging.debug("client closed connection")
153 153
        break
154 154

  
155
      request = simplejson.loads(msg)
155
      request = serializer.LoadJson(msg)
156 156
      logging.debug("request: %s", request)
157 157
      if not isinstance(request, dict):
158 158
        logging.error("wrong request received: %s", msg)
......
181 181
        luxi.KEY_RESULT: result,
182 182
        }
183 183
      logging.debug("response: %s", response)
184
      self.send_message(simplejson.dumps(response))
184
      self.send_message(serializer.DumpJson(response))
185 185

  
186 186
  def read_message(self):
187 187
    while not self._msgs:

Also available in: Unified diff