Revision e8a701f6

b/lib/server/masterd.py
134 134
  """
135 135
  family = socket.AF_UNIX
136 136

  
137
  def __init__(self, mainloop, address, uid, gid):
137
  def __init__(self, address, uid, gid):
138 138
    """MasterServer constructor
139 139

  
140
    @type mainloop: ganeti.daemon.Mainloop
141
    @param mainloop: Mainloop used to poll for I/O events
142 140
    @param address: the unix socket address to bind the MasterServer to
143 141
    @param uid: The uid of the owner of the socket
144 142
    @param gid: The gid of the owner of the socket
......
150 148
    os.chown(temp_name, uid, gid)
151 149
    os.rename(temp_name, address)
152 150

  
153
    self.mainloop = mainloop
154 151
    self.awaker = daemon.AsyncAwaker()
155 152

  
156 153
    # We'll only start threads once we've forked.
......
625 622
  utils.RemoveFile(constants.MASTER_SOCKET)
626 623

  
627 624
  mainloop = daemon.Mainloop()
628
  master = MasterServer(mainloop, constants.MASTER_SOCKET,
629
                        options.uid, options.gid)
625
  master = MasterServer(constants.MASTER_SOCKET, options.uid, options.gid)
630 626
  return (mainloop, master)
631 627

  
632 628

  

Also available in: Unified diff