git.iko.soy/typeable/katip
on master help sign in
Updates to configuration
00f7f7eMichael Xavier
katip-elasticsearch/katip-elasticsearch.cabal+1−1
compare with master
unifiedsplit
@@ -46,7 +46,7 @@ library
46 build-depends:
46 build-depends:
47 base >=4.6 && <5
47 base >=4.6 && <5
48 , katip
48 , katip
49− , bloodhound >= 0.7.0.1 && < 0.11
49+ , bloodhound >= 0.10.0.0 && < 0.11
50 , random >= 1.0 && < 1.2
50 , random >= 1.0 && < 1.2
51 , uuid >= 1.3 && < 1.4
51 , uuid >= 1.3 && < 1.4
52 , aeson >=0.6 && <0.11
52 , aeson >=0.6 && <0.11
katip-elasticsearch/src/Katip/Scribes/ElasticSearch.hs+4−12
@@ -13,7 +13,6 @@ module Katip.Scribes.ElasticSearch
13 , EsPoolSize
13 , EsPoolSize
14 , mkEsPoolSize
14 , mkEsPoolSize
15 , EsScribeCfg
15 , EsScribeCfg
16− , essManagerSettings
17 , essRetryPolicy
16 , essRetryPolicy
18 , essQueueSize
17 , essQueueSize
19 , essPoolSize
18 , essPoolSize
@@ -65,9 +64,7 @@ import Katip.Scribes.ElasticSearch.Annotations
65
64
66
65
67data EsScribeCfg = EsScribeCfg {
66data EsScribeCfg = EsScribeCfg {
68− essManagerSettings :: ManagerSettings
69− -- ^ Connection manager settings
70− , essRetryPolicy :: RetryPolicy
67+ essRetryPolicy :: RetryPolicy
71 -- ^ Retry policy when there are errors sending logs to the server
68 -- ^ Retry policy when there are errors sending logs to the server
72 , essQueueSize :: EsQueueSize
69 , essQueueSize :: EsQueueSize
73 -- ^ Maximum size of the bounded log queue
70 -- ^ Maximum size of the bounded log queue
@@ -106,8 +103,7 @@ data EsScribeCfg = EsScribeCfg {
106-- * DailyIndexSharding
103-- * DailyIndexSharding
107defaultEsScribeCfg :: EsScribeCfg
104defaultEsScribeCfg :: EsScribeCfg
108defaultEsScribeCfg = EsScribeCfg {
105defaultEsScribeCfg = EsScribeCfg {
109− essManagerSettings = defaultManagerSettings
110− , essRetryPolicy = exponentialBackoff 25 <> limitRetries 5
106+ essRetryPolicy = exponentialBackoff 25 <> limitRetries 5
111 , essQueueSize = EsQueueSize 1000
107 , essQueueSize = EsQueueSize 1000
112 , essPoolSize = EsPoolSize 2
108 , essPoolSize = EsPoolSize 2
113 , essAnnotateTypes = False
109 , essAnnotateTypes = False
@@ -238,7 +234,7 @@ instance Exception EsScribeSetupError
238-------------------------------------------------------------------------------
234-------------------------------------------------------------------------------
239mkEsScribe
235mkEsScribe
240 :: EsScribeCfg
236 :: EsScribeCfg
241− -> Server
237+ -> BHEnv
242 -> IndexName
238 -> IndexName
243 -- ^ Treated as a prefix if index sharding is enabled
239 -- ^ Treated as a prefix if index sharding is enabled
244 -> MappingName
240 -> MappingName
@@ -246,12 +242,8 @@ mkEsScribe
246 -> Verbosity
242 -> Verbosity
247 -> IO (Scribe, IO ())
243 -> IO (Scribe, IO ())
248 -- ^ Returns a finalizer that will gracefully flush all remaining logs before shutting down workers
244 -- ^ Returns a finalizer that will gracefully flush all remaining logs before shutting down workers
249−mkEsScribe cfg@EsScribeCfg {..} server ix mapping sev verb = do
245+mkEsScribe cfg@EsScribeCfg {..} env ix mapping sev verb = do
250 q <- newTBMQueueIO $ unEsQueueSize essQueueSize
246 q <- newTBMQueueIO $ unEsQueueSize essQueueSize
251− mgr <- newManager essManagerSettings
252− let env = BHEnv { bhServer = server
253− , bhManager = mgr
254− }
255 endSig <- newEmptyMVar
247 endSig <- newEmptyMVar
256
248
257 runBH env $ do
249 runBH env $ do