From 9936bd6395c5c1ca7516b92a9f84edf6b07aedd5 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 30 Jul 2008 12:29:07 +0000
Subject: [PATCH] Simplify the log constants and add another one

The patch changes the log constants by moving the slash to the end of
the log dir instead of at the beginning of *each* log file name.

It also adds a new LOG_COMMANDS constant (to be used in a next patch).

Reviewed-by: ultrotter
---
 lib/constants.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/constants.py b/lib/constants.py
index 1950ac55f..3ab3885af 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -108,13 +108,14 @@ FIRST_DRBD_PORT = 11000
 LAST_DRBD_PORT = 14999
 MASTER_SCRIPT = "ganeti-master"
 
-LOG_DIR = _autoconf.LOCALSTATEDIR + "/log/ganeti"
-LOG_OS_DIR = LOG_DIR + "/os"
-LOG_NODESERVER = LOG_DIR + "/node-daemon.log"
-LOG_WATCHER = LOG_DIR + "/watcher.log"
-LOG_MASTERDAEMON = LOG_DIR + "/master-daemon.log"
-LOG_RAPISERVER = LOG_DIR + "/rapi-daemon.log"
-LOG_RAPIACCESS = LOG_DIR + "/rapi-access.log"
+LOG_DIR = _autoconf.LOCALSTATEDIR + "/log/ganeti/"
+LOG_OS_DIR = LOG_DIR + "os"
+LOG_NODESERVER = LOG_DIR + "node-daemon.log"
+LOG_WATCHER = LOG_DIR + "watcher.log"
+LOG_MASTERDAEMON = LOG_DIR + "master-daemon.log"
+LOG_RAPISERVER = LOG_DIR + "rapi-daemon.log"
+LOG_RAPIACCESS = LOG_DIR + "rapi-access.log"
+LOG_COMMANDS = LOG_DIR + "commands.log"
 
 OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH
 EXPORT_DIR = _autoconf.EXPORT_DIR
-- 
GitLab