Disable WebUI logging until we come up with a way to make it SELinux friendly.

3 files changed, 27 insertions, 15 deletions

diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py
index f361560..8026ebc 100644
--- a/cobbler/webui/CobblerWeb.py
+++ b/cobbler/webui/CobblerWeb.py
@@ -21,22 +21,29 @@ import sys
 import Cookie
 import time
 
+LOGGING_ENABLED = True
 COOKIE_TIMEOUT=29*60
-INVALID_CREDS="Login Required"
 
-# set up logging
-logger = logging.getLogger("cobbler.webui")
-logger.setLevel(logging.DEBUG)
-ch = logging.FileHandler("/var/log/httpd/cobbler_webui.log")
-ch.setLevel(logging.DEBUG)
-formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-ch.setFormatter(formatter)
-logger.addHandler(ch)
+if LOGGING_ENABLED:
+    # set up logging
+    logger = logging.getLogger("cobbler.webui")
+    logger.setLevel(logging.DEBUG)
+    ch = logging.FileHandler("/var/log/cobbler/webui.log")
+    ch.setLevel(logging.DEBUG)
+    formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+    ch.setFormatter(formatter)
+    logger.addHandler(ch)
+else:
+    logger = None
+
+INVALID_CREDS="Login Required"
 
 def log_exc():
    """
    Log active traceback to logfile.
    """
+   if not LOGGING_ENABLED:
+       return
    (t, v, tb) = sys.exc_info()
    logger.info("Exception occured: %s" % t )
    logger.info("Exception value: %s" % v)
@@ -81,8 +88,9 @@ class CobblerWeb(object):
                 return True
             except Exception, e:
                 if str(e).find("invalid token") != -1:
-                    logger.info("token timeout for: %s" % self.username)
-                    log_exc()
+                    if LOGGING_ENABLED:
+                        logger.info("token timeout for: %s" % self.username)
+                        log_exc()
                     self.token = None
                     # this should put us back to the login screen
                     self.__cookie_logout()
@@ -94,7 +102,8 @@ class CobblerWeb(object):
             try:
                 self.token = self.remote.login( self.username, self.password )
             except Exception, e:
-                logger.info("login failed for: %s" % self.username)
+                if LOGGING_ENABLED:
+                    logger.info("login failed for: %s" % self.username)
                 log_exc()
                 return False
             self.__cookie_login(self.token) # save what we've got
@@ -194,7 +203,8 @@ class CobblerWeb(object):
     def __get_cookie_token(self):
         if self.__cookies.has_key("cobbler_xmlrpc_token"):
             value = self.__cookies["cobbler_xmlrpc_token"]
-            logger.debug("loading token from cookie: %s" % value.value)
+            if LOGGING_ENABLED:
+                logger.debug("loading token from cookie: %s" % value.value)
             return value.value
         return None
 
diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py
index df09f8e..98d0ba4 100644
--- a/cobbler/webui/master.py
+++ b/cobbler/webui/master.py
@@ -33,8 +33,8 @@ VFN=valueForName
 currentTime=time.time
 __CHEETAH_version__ = '2.0rc8'
 __CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8)
-__CHEETAH_genTime__ = 1190817364.3782139
-__CHEETAH_genTimestamp__ = 'Wed Sep 26 10:36:04 2007'
+__CHEETAH_genTime__ = 1190905054.4749429
+__CHEETAH_genTimestamp__ = 'Thu Sep 27 10:57:34 2007'
 __CHEETAH_src__ = 'webui_templates/master.tmpl'
 __CHEETAH_srcLastModified__ = 'Thu Sep 20 15:49:34 2007'
 __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'
diff --git a/setup.py b/setup.py
index 9aaccdc..af587c0 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@ if __name__ == "__main__":
         logpath  = "/var/log/cobbler/"
         logpath2 = "/var/log/cobbler/kicklog"
         logpath3 = "/var/log/cobbler/syslog"
+        logpath4 = "/var/log/httpd/cobbler"
         snippets = "/var/lib/cobbler/snippets"
         vl_kick  = "/var/lib/cobbler/kickstarts"
         wwwtmpl  = "/usr/share/cobbler/webui_templates/"
@@ -102,6 +103,7 @@ if __name__ == "__main__":
                                 (logpath,  []),
                                 (logpath2, []),
                                 (logpath3, []),
+				(logpath4, []),
 
                                 # web page directories that we own
                                 (vw_localmirror,    []),