@@ -28,7 +28,7 @@ import Control.Retry (RetryPolicy,
28 recovering)
28 recovering)
29import Data.Aeson
29import Data.Aeson
30import Data.ByteString.Lazy (ByteString)
30import Data.ByteString.Lazy (ByteString)
31−import Data.List.NonEmpty (NonEmpty(..))
31+import Data.List.NonEmpty (NonEmpty (..))
32import Data.Monoid ((<>))
32import Data.Monoid ((<>))
33import Data.Text (Text)
33import Data.Text (Text)
34import qualified Data.Text as T
34import qualified Data.Text as T
@@ -266,13 +266,14 @@ mkEsScribe
267 => EsScribeCfg v
267 => EsScribeCfg v
268 -> BHEnv v
268 -> BHEnv v
269+ -> (ESVersion v => proxy v -> MappingName v -> Value)
269 -> IndexName v
270 -> IndexName v
270 -- ^ Treated as a prefix if index sharding is enabled
271 -- ^ Treated as a prefix if index sharding is enabled
271 -> MappingName v
272 -> MappingName v
272 -> Severity
273 -> Severity
273 -> Verbosity
274 -> Verbosity
274 -> IO Scribe
275 -> IO Scribe
275−mkEsScribe cfg@EsScribeCfg {..} env ix mapping sev verb = do
276+mkEsScribe cfg@EsScribeCfg {..} env indexMapper ix mapping sev verb = do
276 q <- newTBMQueueIO $ unEsQueueSize essQueueSize
277 q <- newTBMQueueIO $ unEsQueueSize essQueueSize
277 endSig <- newEmptyMVar
278 endSig <- newEmptyMVar
@@ -320,7 +321,7 @@ mkEsScribe cfg@EsScribeCfg {..} env ix mapping sev verb = do
320 NoIndexSharding -> False
321 NoIndexSharding -> False
321 _ -> True
322 _ -> True
322 tpl = toIndexTemplate prx (toTemplatePattern prx (ixn <> "-*")) (Just essIndexSettings) [toJSON base]
323 tpl = toIndexTemplate prx (toTemplatePattern prx (ixn <> "-*")) (Just essIndexSettings) [toJSON base]
323− base = baseMapping prx mapping
324+ base = indexMapper prx mapping
324 ixn = fromIndexName prx ix
325 ixn = fromIndexName prx ix
325 itemJson' :: LogItem a => Item a -> Value
326 itemJson' :: LogItem a => Item a -> Value
326 itemJson' i
327 itemJson' i