Remove *.log files in `make clean`.
clean:
runghc Setup.hs clean
clean:
runghc Setup.hs clean
$(TESTSUITE_BIN): src/*.hs test/TestSuite.hs
runghc Setup.hs configure --user --enable-tests
$(TESTSUITE_BIN): src/*.hs test/TestSuite.hs
runghc Setup.hs configure --user --enable-tests
+import System.Log.Formatter ( simpleLogFormatter )
+import System.Log.Handler ( setFormatter )
import System.Log.Handler.Simple ( fileHandler )
import System.Log.Handler.Syslog (
Facility ( USER ),
import System.Log.Handler.Simple ( fileHandler )
import System.Log.Handler.Syslog (
Facility ( USER ),
openlog )
import System.Log.Logger (
Priority ( DEBUG, INFO ),
openlog )
import System.Log.Logger (
Priority ( DEBUG, INFO ),
updateGlobalLogger,
warningM )
updateGlobalLogger,
warningM )
log_debug :: String -> IO ()
log_debug = debugM rootLoggerName
log_debug :: String -> IO ()
log_debug = debugM rootLoggerName
log_warning :: String -> IO ()
log_warning = warningM rootLoggerName
log_warning :: String -> IO ()
log_warning = warningM rootLoggerName
+
+-- | Why don't we take a Configuration as an argument? Because it
+-- would create circular imports!
init_logging :: FilePath -> Priority -> Bool -> IO ()
init_logging log_file log_level syslog
| syslog == True = do
init_logging :: FilePath -> Priority -> Bool -> IO ()
init_logging log_file log_level syslog
| syslog == True = do
- handler <- openlog rootLoggerName [PID] USER level
+ handler' <- openlog rootLoggerName [] USER level
+ -- Syslog should output the date by itself.
+ let slf = simpleLogFormatter "htsn[$pid] $prio: $msg"
+ let handler = setFormatter handler' slf
updateGlobalLogger rootLoggerName (setLevel level . setHandlers [handler])
| otherwise = do
updateGlobalLogger rootLoggerName (setLevel level . setHandlers [handler])
| otherwise = do
- handler <- fileHandler log_file level
+ handler' <- fileHandler log_file level
+ let slf = simpleLogFormatter "$time: htsn[$pid] $prio: $msg"
+ let handler = setFormatter handler' slf
updateGlobalLogger rootLoggerName (setLevel level . setHandlers [handler])
where
min_level = if syslog then INFO else DEBUG
updateGlobalLogger rootLoggerName (setLevel level . setHandlers [handler])
where
min_level = if syslog then INFO else DEBUG
connect_and_loop :: Configuration -> String -> IO ()
connect_and_loop cfg host = do
connect_and_loop :: Configuration -> String -> IO ()
connect_and_loop cfg host = do
- report_info $ "Connecting to " ++ host ++ "..."
+ report_info $ "Connecting to " ++ host ++ "."
bracket acquire_handle release_handle action
return ()
where
bracket acquire_handle release_handle action
return ()
where