git.iko.soy/typeable/katip
on master help sign in
Update es to work with our fork of bloodhound
commit7649bba5c5dab1eede77c99e62948c257eff32cd authorMichael Xavier <michael@michaelxavier.net> dateTue 17 Mar 2015, 11:49 (12 years ago) parentb9888de
2 files changed+13−5
compare with master
unifiedsplit
katip-elasticsearch/katip-elasticsearch.cabal+1 katip-elasticsearch/src/Katip/Scribes/ElasticSearch.hs+12−5
katip-elasticsearch/katip-elasticsearch.cabal+1
@@ -18,6 +18,7 @@ library
1818 , bloodhound >= 0.5 && < 0.6
1919 , random >= 1.0 && < 1.2
2020 , uuid >= 1.3 && < 1.4
21+ , http-client
2122 hs-source-dirs: src
2223 default-language: Haskell2010
2324
katip-elasticsearch/src/Katip/Scribes/ElasticSearch.hs+12−5
@@ -5,6 +5,7 @@ module Katip.Scribes.ElasticSearch where
55import Control.Monad
66import Data.UUID
77import Database.Bloodhound
8+import Network.HTTP.Client
89import System.Random
910-------------------------------------------------------------------------------
1011import Katip.Core
@@ -13,16 +14,22 @@ import Katip.Core
1314
1415-------------------------------------------------------------------------------
1516mkEsScribe
16− :: Server
17+ :: ManagerSettings
18+ -> Server
1719 -> IndexName
1820 -> MappingName
1921 -> Severity
2022 -> Verbosity
2123 -> IO Scribe
22−mkEsScribe server ix mapping sev verb = return $ Scribe $ \ i -> do
23− did <- mkDocId
24− when (_itemSeverity i >= sev) $
25− void $ indexDocument server ix mapping (itemJson verb i) did
24+mkEsScribe ms server ix mapping sev verb =
25+ withManager ms $ \mgr -> do
26+ let env = BHEnv { bhServer = server
27+ , bhManager = mgr
28+ }
29+ return $ Scribe $ \ i -> do
30+ did <- mkDocId
31+ when (_itemSeverity i >= sev) $
32+ void $ runBH env $ indexDocument ix mapping (itemJson verb i) did
2633
2734
2835-------------------------------------------------------------------------------