Revert unintentional change of daemon log file names

Commit 3329f4dea6 unintentionally changed the filenames of all daemon
log files. This patch reverts part of those changes.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

diff --git a/lib/constants.py b/lib/constants.py
index 45b3f41..56ebea5 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -167,6 +167,13 @@ DEFAULT_NLD_PORT = DAEMONS_PORTS[NLD][1]
 FIRST_DRBD_PORT = 11000
 LAST_DRBD_PORT = 14999
 
+DAEMONS_LOGFILES = {
+  NODED: pathutils.GetLogFilename("node-daemon"),
+  CONFD: pathutils.GetLogFilename("conf-daemon"),
+  RAPI: pathutils.GetLogFilename("rapi-daemon"),
+  MASTERD: pathutils.GetLogFilename("master-daemon"),
+  }
+
 DEV_CONSOLE = "/dev/console"
 
 PROC_MOUNTS = "/proc/mounts"

diff --git a/lib/daemon.py b/lib/daemon.py
index ed5665e..62ea1f4 100644 (file)
--- a/lib/daemon.py
+++ b/lib/daemon.py
@@ -41,7 +41,6 @@ from ganeti import netutils
 from ganeti import ssconf
 from ganeti import runtime
 from ganeti import compat
-from ganeti import pathutils
 
 
 class SchedulerBreakout(Exception):
@@ -779,7 +778,7 @@ def GenericMain(daemon_name, optionparser,
   if check_fn is not None:
     check_fn(options, args)
 
-  log_filename = pathutils.GetLogFilename(daemon_name)
+  log_filename = constants.DAEMONS_LOGFILES[daemon_name]
 
   if options.fork:
     utils.CloseFDs()

diff --git a/lib/tools/ensure_dirs.py b/lib/tools/ensure_dirs.py
index e950a4e..ff24dae 100644 (file)
--- a/lib/tools/ensure_dirs.py
+++ b/lib/tools/ensure_dirs.py
@@ -118,10 +118,10 @@ def GetPaths():
 
   """
   getent = runtime.GetEnts()
-  masterd_log = pathutils.GetLogFilename(constants.MASTERD)
-  noded_log = pathutils.GetLogFilename(constants.NODED)
-  confd_log = pathutils.GetLogFilename(constants.CONFD)
-  rapi_log = pathutils.GetLogFilename(constants.RAPI)
+  masterd_log = constants.DAEMONS_LOGFILES[constants.MASTERD]
+  noded_log = constants.DAEMONS_LOGFILES[constants.NODED]
+  confd_log = constants.DAEMONS_LOGFILES[constants.CONFD]
+  rapi_log = constants.DAEMONS_LOGFILES[constants.RAPI]
 
   rapi_dir = os.path.join(pathutils.DATA_DIR, "rapi")