rotating-log 0.1 → 0.2

raw patch · 3 files changed

+29/−10 lines, 3 files

Files

• rotating-log.cabal +4/−2
• src/System/RotatingLog.hs +20/−7
• test/TestRotate.hs +5/−1

@@ -1,5 +1,5 @@ name:                rotating-log-version:             0.1+version:             0.2 description:         Size-limited, concurrent, automatically-rotating log writer for production applications. license:             BSD3 license-file:        LICENSE@@ -26,8 +26,10 @@        ghc-options: -Wall -fwarn-tabs -executable test-rotate+test-suite test-rotate+  type: exitcode-stdio-1.0                               main-is: TestRotate.hs+  ghc-options: -Wall   hs-source-dirs: test, src   build-depends:     base               >= 4,

@@ -46,6 +46,7 @@     { logInfo    :: MVar LogInfo     , namePrefix :: String     , sizeLimit  :: Word64+    , buffering  :: BufferMode     , postAction :: FilePath -> IO ()     } @@ -72,19 +73,31 @@     -- ^ A prefix for the written log files.     -> Word64     -- ^ A size limit in bytes.+    -> BufferMode+    -- ^ A buffering mode for output; we leave it to you to decide how+    -- often the file should be flushed.     -> (FilePath -> IO ())     -- ^ An action to be performed on the finished file following     -- rotation. For example, you could give a callback that moves or     -- ships the files somewhere else.     -> IO RotatingLog-mkRotatingLog pre limit pa = do-    let fp = curLogFileName pre-    h <- openFile fp AppendMode+mkRotatingLog pre limit buf pa = do+    mvar <- newEmptyMVar+    let rl = RotatingLog mvar pre limit buf pa+    h <- openLogFile rl     len <- hFileSize h-    mvar <- newMVar $ LogInfo h (fromIntegral len)-    return $ RotatingLog mvar pre limit pa+    putMVar mvar $ LogInfo h (fromIntegral len)+    return rl  +-------------------------------------------------------------------------------+openLogFile RotatingLog{..} = do+    let fp = curLogFileName namePrefix+    h <- openFile fp AppendMode+    hSetBuffering h buffering+    return h++ ------------------------------------------------------------------------------ -- | Like "rotatedWrite'", but doesn't need a UTCTime and obtains it -- with a syscall.@@ -104,14 +117,14 @@ -- to log non-textual streams such as binary serialized or compressed -- content. rotatedWrite' :: RotatingLog -> UTCTime -> ByteString -> IO ()-rotatedWrite' RotatingLog{..} t bs = do+rotatedWrite' rl@RotatingLog{..} t bs = do     modifyMVar_ logInfo $ \LogInfo{..} -> do         (h,b) <- if bytesWritten + len > sizeLimit                    then do hClose curHandle                            let newFile = logFileName namePrefix t                            renameFile curFile newFile                            postAction newFile-                           h <- openFile curFile AppendMode+                           h <- openLogFile rl                            return (h, 0)                    else return (curHandle, bytesWritten)         B.hPutStr h bs

@@ -2,10 +2,14 @@  module Main where +------------------------------------------------------------------------------- import           Control.Concurrent import qualified Data.ByteString.Char8 as B+import           System.IO import           System.RotatingLog+------------------------------------------------------------------------------- + thread :: RotatingLog -> B.ByteString -> Int -> IO () thread _log pre n = do     rotatedWrite _log (B.concat [pre, ": ", B.pack $ show n, "\n"])@@ -13,7 +17,7 @@  main :: IO () main = do-    _log <- mkRotatingLog "foo" 1000000 (archiveFile "logs")+    _log <- mkRotatingLog "foo" 1000000 LineBuffering (archiveFile "logs")     a <- forkIO $ thread _log "a" 0     b <- forkIO $ thread _log "b" 0     c <- forkIO $ thread _log "c" 0