Successful test of un-chunked message.

diff --git a/Makefile b/Makefile
index f577035e1887bceb3247f95d7a4baa051416f5a2..79e693793f1901ae3410e4e483af3fece5e2826c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,8 @@
+build:
+       stack build
+
+repl:
+       stack repl
+
 graylog:
        docker run -t -p 9000:9000 -p 12201:12201 -p 12201:12201/udp graylog2/allinone

diff --git a/src/Graylog/Gelf.hs b/src/Graylog/Gelf.hs
index 32b932121911f85882c3b07b9aa995af01a4bb68..cd68e057d37144f38c03839a999eca667a6dee85 100644 (file)
--- a/src/Graylog/Gelf.hs
+++ b/src/Graylog/Gelf.hs
@@ -59,3 +59,12 @@ instance ToJSON SyslogLevel where
    toJSON Notice        = Number 5
    toJSON Informational = Number 6
    toJSON Debug         = Number 7
+
+--
+
+simpleGelf
+   :: Text     -- ^ Hostname
+   -> Text     -- ^ Short message
+   -> GELF
+simpleGelf host short =
+   GELF Version1x1 host short Nothing Nothing Nothing Nothing Nothing

diff --git a/src/Graylog/Types.hs b/src/Graylog/Types.hs
index bfee38aca7cc6d342cb94bc4364c9a9d3da01a34..8fad8cc3f1e3ba6e72807904d9acdc5baf255aa2 100644 (file)
--- a/src/Graylog/Types.hs
+++ b/src/Graylog/Types.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE LambdaCase      #-}
 {-# LANGUAGE RecordWildCards #-}
 
 module Graylog.Types
@@ -14,6 +15,7 @@ module Graylog.Types
    , closeGraylog
    ) where
 
+import           Data.List
 import           Data.Text      (Text)
 import qualified Data.Text      as T
 import           Network.BSD
@@ -34,19 +36,18 @@ data Graylog
 defaultChunkSize :: ChunkSize
 defaultChunkSize = 8192
 
-openGraylog :: HostName -> ServiceName -> ChunkSize -> IO (Either String Graylog)
-openGraylog host port chksize = do
-   infos <- getAddrInfo Nothing (Just host) (Just port)
-   case infos of
-      []     -> return $ Left "No address info found."
-      [info] -> do
-         sock <- socket (addrFamily info) Datagram defaultProtocol
-         connect sock (addrAddress info)
-         hostname <- getHostName
-         return $ Right $ Graylog host port info sock (T.pack hostname) chksize
-      _      -> return $ Left "Too many address infos found."
+openGraylog
+   :: HostName -> ServiceName -> ChunkSize -> IO (Either String Graylog)
+openGraylog h p cksize = getAddrInfo Nothing (Just h) (Just p) >>= \case
+   []     -> return $ Left "No address info found."
+   infos ->
+      case find (\i -> addrSocketType i == Datagram) infos of
+         Nothing -> return $ Left "No datagram info found for address."
+         Just  i -> do
+            sock <- socket (addrFamily i) Datagram defaultProtocol
+            connect sock (addrAddress i)
+            hostname <- getHostName
+            return $ Right $ Graylog h p i sock (T.pack hostname) cksize
 
 closeGraylog :: Graylog -> IO ()
 closeGraylog Graylog{..} = close _graylogSocket
-
-

diff --git a/src/Graylog/UDP.hs b/src/Graylog/UDP.hs
index 656cbc88676b15bd46e988afcfd2bc583c1b4558..c925d7ead33d339be0280e02796f0fb1cb9a8da9 100644 (file)
--- a/src/Graylog/UDP.hs
+++ b/src/Graylog/UDP.hs
@@ -5,27 +5,37 @@ module Graylog.UDP
    ) where
 
 import           Data.Aeson
-import qualified Data.ByteString.Lazy           as LBS
-import           Data.Word
+{-import           Data.ByteString.Builder-}
+{-import qualified Data.ByteString.Lazy           as LBS-}
+{-import           Data.Word-}
 import           Network.Socket.ByteString.Lazy
-import           System.Random
+{-import           System.Random-}
 
 import           Graylog.Gelf                   as Export
 import           Graylog.Types                  as Export
 
 sendLog :: Graylog -> GELF -> IO ()
-sendLog glog msg = mapM_ (send $ _graylogSocket glog) cks
+sendLog glog msg = do
+   _ <- send (_graylogSocket glog) raw
+   print raw
+   return ()
    where
       raw = encode msg
-      cks = chunky glog raw
 
-chunky :: Graylog -> LBS.ByteString -> IO [LBS.ByteString]
-chunky glog raw = do
-   groupId <- randomIO
-   splitAt gsize
-   where
-      magic = undefined
-      seq   = undefined
-      total = undefined
-      hlen  = 12
-      gsize = (fromIntegral (_graylogChunkSize glog)) - hlen
+{-sendLog :: Graylog -> GELF -> IO ()-}
+{-sendLog glog msg = do-}
+   {-cks <- chunky glog raw-}
+   {-mapM_ (send $ _graylogSocket glog) cks-}
+   {-where-}
+      {-raw = encode msg-}
+
+{-chunky :: Graylog -> LBS.ByteString -> IO [LBS.ByteString]-}
+{-chunky glog raw = do-}
+   {-groupId <- randomIO-}
+   {-splitAt gsize-}
+   {-where-}
+      {-magic           = word8 0x1e <> word8 0x0f-}
+      {-seqNum          = undefined-}
+      {-(count, excess) = quotRem (LBS.length raw) gzie-}
+      {-hlen            = 12-}
+      {-gsize           = (fromIntegral (_graylogChunkSize glog)) - hlen-}

diff --git a/test/Test/Graylog/UDP.hs b/test/Test/Graylog/UDP.hs
index 67da6fe9d712837ded66e0a37e0949e2099ce74e..d62f11a25a0e39b078139181eed040306a6bf2f9 100644 (file)
--- a/test/Test/Graylog/UDP.hs
+++ b/test/Test/Graylog/UDP.hs
@@ -1,13 +1,23 @@
+{-# LANGUAGE OverloadedStrings #-}
+
 module Test.Graylog.UDP where
 
 import           Test.Tasty
 import           Test.Tasty.HUnit
 
+import           Graylog.UDP
+
 tests :: TestTree
 tests = testGroup "Test.Graylog.UDP"
-   [ testCase "Validation: Something" case_validateSomething
+   {-[ testCase "Send: Sample" case_validateSomething-}
+   [ testCase "Send sample message." case_sendSample
    ]
 
-case_validateSomething :: IO ()
-case_validateSomething = return ()
-
+case_sendSample :: IO ()
+case_sendSample = do
+   eglog <- openGraylog "192.168.99.100" "12201" defaultChunkSize
+   case eglog of
+      Left  e -> assertFailure e
+      Right g -> sendLog g sample
+   where
+      sample = simpleGelf "localhost" "hello world!"