From ba4e38e84f609aff4e5b1f875a0d8c80dfe180cc Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 23 Nov 2011 17:17:08 +0100
Subject: [PATCH] htools: add logging functionality
This adds a dependency on hslogger 1.1+, which is not available in
Debian Squeeze, only in later versions.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
Makefile.am | 1 +
htools/Ganeti/Logging.hs | 124 +++++++++++++++++++++++++++++++++++++++
2 files changed, 125 insertions(+)
create mode 100644 htools/Ganeti/Logging.hs
diff --git a/Makefile.am b/Makefile.am
index d92139c99..6c0c71274 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -399,6 +399,7 @@ HS_LIB_SRCS = \
htools/Ganeti/Config.hs \
htools/Ganeti/Hash.hs \
htools/Ganeti/Jobs.hs \
+ htools/Ganeti/Logging.hs \
htools/Ganeti/Luxi.hs \
htools/Ganeti/Objects.hs \
htools/Ganeti/OpCodes.hs \
diff --git a/htools/Ganeti/Logging.hs b/htools/Ganeti/Logging.hs
new file mode 100644
index 000000000..14b5109c5
--- /dev/null
+++ b/htools/Ganeti/Logging.hs
@@ -0,0 +1,124 @@
+{-| Implementation of the Ganeti logging functionality.
+
+This currently lacks the following (FIXME):
+
+- syslog logging
+- handling of the three-state syslog yes/no/only
+- log file reopening
+
+Note that this requires the hslogger library version 1.1 and above.
+
+-}
+
+{-
+
+Copyright (C) 2011 Google Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.
+
+-}
+
+module Ganeti.Logging
+ ( setupLogging
+ , logDebug
+ , logInfo
+ , logNotice
+ , logWarning
+ , logError
+ , logCritical
+ , logAlert
+ , logEmergency
+ ) where
+
+import System.Log.Logger
+import System.Log.Handler.Simple
+import System.Log.Handler (setFormatter)
+import System.Log.Formatter
+import System.IO
+
+import qualified Ganeti.Constants as C
+
+-- | Builds the log formatter.
+logFormatter :: String -- ^ Program
+ -> Bool -- ^ Multithreaded
+ -> Bool -- ^ Syslog
+ -> LogFormatter a
+logFormatter prog mt syslog =
+ let parts = [ if syslog
+ then "[$pid]:"
+ else "$time: " ++ prog ++ " pid=$pid"
+ , if mt then if syslog then " ($tid)" else "/$tid"
+ else ""
+ , " $prio $msg"
+ ]
+ in simpleLogFormatter $ concat parts
+
+-- | Sets up the logging configuration.
+setupLogging :: String -- ^ Log file
+ -> String -- ^ Program name
+ -> Bool -- ^ Debug level
+ -> Bool -- ^ Log to stderr
+ -> Bool -- ^ Log to console
+ -> IO ()
+setupLogging logf program debug stderr_logging console = do
+ let level = if debug then DEBUG else INFO
+ destf = if console then C.devConsole else logf
+ fmt = logFormatter program False False
+
+ updateGlobalLogger rootLoggerName (setLevel level)
+
+ stderr_handlers <- if stderr_logging
+ then do
+ stderr_handler <- streamHandler stderr level
+ return [setFormatter stderr_handler fmt]
+ else return []
+ file_handler <- fileHandler destf level
+ let handlers = setFormatter file_handler fmt:stderr_handlers
+ updateGlobalLogger rootLoggerName $ setHandlers handlers
+
+-- * Logging function aliases
+
+-- | Log at debug level.
+logDebug :: String -> IO ()
+logDebug = debugM rootLoggerName
+
+-- | Log at info level.
+logInfo :: String -> IO ()
+logInfo = infoM rootLoggerName
+
+-- | Log at notice level.
+logNotice :: String -> IO ()
+logNotice = noticeM rootLoggerName
+
+-- | Log at warning level.
+logWarning :: String -> IO ()
+logWarning = warningM rootLoggerName
+
+-- | Log at error level.
+logError :: String -> IO ()
+logError = errorM rootLoggerName
+
+-- | Log at critical level.
+logCritical :: String -> IO ()
+logCritical = criticalM rootLoggerName
+
+-- | Log at alert level.
+logAlert :: String -> IO ()
+logAlert = alertM rootLoggerName
+
+-- | Log at emergency level.
+logEmergency :: String -> IO ()
+logEmergency = emergencyM rootLoggerName
--
GitLab