Revision 3a6a89d7

b/lib/constants.py
167 167
FIRST_DRBD_PORT = 11000
168 168
LAST_DRBD_PORT = 14999
169 169

  
170
DAEMONS_LOGFILES = {
171
  NODED: pathutils.GetLogFilename("node-daemon"),
172
  CONFD: pathutils.GetLogFilename("conf-daemon"),
173
  RAPI: pathutils.GetLogFilename("rapi-daemon"),
174
  MASTERD: pathutils.GetLogFilename("master-daemon"),
175
  }
176

  
170 177
DEV_CONSOLE = "/dev/console"
171 178

  
172 179
PROC_MOUNTS = "/proc/mounts"
b/lib/daemon.py
41 41
from ganeti import ssconf
42 42
from ganeti import runtime
43 43
from ganeti import compat
44
from ganeti import pathutils
45 44

  
46 45

  
47 46
class SchedulerBreakout(Exception):
......
779 778
  if check_fn is not None:
780 779
    check_fn(options, args)
781 780

  
782
  log_filename = pathutils.GetLogFilename(daemon_name)
781
  log_filename = constants.DAEMONS_LOGFILES[daemon_name]
783 782

  
784 783
  if options.fork:
785 784
    utils.CloseFDs()
b/lib/tools/ensure_dirs.py
118 118

  
119 119
  """
120 120
  getent = runtime.GetEnts()
121
  masterd_log = pathutils.GetLogFilename(constants.MASTERD)
122
  noded_log = pathutils.GetLogFilename(constants.NODED)
123
  confd_log = pathutils.GetLogFilename(constants.CONFD)
124
  rapi_log = pathutils.GetLogFilename(constants.RAPI)
121
  masterd_log = constants.DAEMONS_LOGFILES[constants.MASTERD]
122
  noded_log = constants.DAEMONS_LOGFILES[constants.NODED]
123
  confd_log = constants.DAEMONS_LOGFILES[constants.CONFD]
124
  rapi_log = constants.DAEMONS_LOGFILES[constants.RAPI]
125 125

  
126 126
  rapi_dir = os.path.join(pathutils.DATA_DIR, "rapi")
127 127

  

Also available in: Unified diff