Revision 912b2278 lib/server/masterd.py

b/lib/server/masterd.py
53 53 
from ganeti import ssconf
54 54 
from ganeti import workerpool
55 55 
import ganeti.rpc.node as rpc
56 
import ganeti.rpc.client as rpccl
56 57 
from ganeti import bootstrap
57 58 
from ganeti import netutils
58 59 
from ganeti import objects
......
92 93 
    client_ops = ClientOps(server)
93 94 

  		





  94
  95
  
    
    try:


  		





  95
  
  
    
      (method, args, ver) = luxi.ParseRequest(message)


  		





  
  96
  
    
      (method, args, ver) = rpccl.ParseRequest(message)


  		





  96
  97
  
    
    except luxi.ProtocolError, err:


  		





  97
  98
  
    
      logging.error("Protocol Error: %s", err)


  		





  98
  99
  
    
      client.close_log()


  		





  ......




  117
  118
  
    
      result = "Caught exception: %s" % str(err[1])


  		





  118
  119
  
    

  		





  119
  120
  
    
    try:


  		





  120
  
  
    
      reply = luxi.FormatResponse(success, result)


  		





  
  121
  
    
      reply = rpccl.FormatResponse(success, result)


  		





  121
  122
  
    
      client.send_message(reply)


  		





  122
  123
  
    
      # awake the main thread so that it can write out the data.


  		





  123
  124
  
    
      server.awaker.signal()


  		












Also available in:
  Unified diff