Revision a5ce2ea2 lib/server/rapi.py

b/lib/server/rapi.py
47 47
from ganeti import serializer
48 48
from ganeti import compat
49 49
from ganeti import utils
50
from ganeti import pathutils
50 51
from ganeti.rapi import connector
51 52

  
52 53
import ganeti.http.auth   # pylint: disable=W0611
......
325 326
  handler = RemoteApiHandler(users.Get)
326 327

  
327 328
  # Setup file watcher (it'll be driven by asyncore)
328
  SetupFileWatcher(constants.RAPI_USERS_FILE,
329
                   compat.partial(users.Load, constants.RAPI_USERS_FILE))
329
  SetupFileWatcher(pathutils.RAPI_USERS_FILE,
330
                   compat.partial(users.Load, pathutils.RAPI_USERS_FILE))
330 331

  
331
  users.Load(constants.RAPI_USERS_FILE)
332
  users.Load(pathutils.RAPI_USERS_FILE)
332 333

  
333 334
  server = \
334 335
    http.server.HttpServer(mainloop, options.bind_address, options.port,
......
360 361
                                 constants.RELEASE_VERSION)
361 362

  
362 363
  daemon.GenericMain(constants.RAPI, parser, CheckRapi, PrepRapi, ExecRapi,
363
                     default_ssl_cert=constants.RAPI_CERT_FILE,
364
                     default_ssl_key=constants.RAPI_CERT_FILE)
364
                     default_ssl_cert=pathutils.RAPI_CERT_FILE,
365
                     default_ssl_key=pathutils.RAPI_CERT_FILE)

Also available in: Unified diff