fb5280d · typeable/katip

git.iko.soy/typeable/katip

Fix: generalize index mapping function

commitfb5280d4ae5d3a52dedc11aa83fdd7438d6a4b19 authorAleksey Uimanov <s9gf4ult@gmail.com> dateWed 7 Aug 2019, 12:42 (7 years ago) parentc773ce4

2 files changed+9−5

compare with master

unifiedsplit

katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Internal.hs+6−4 katip-elasticsearch/test/Main.hs+3−1

katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Internal.hs+6−4

@@ -268,10 +268,13 @@ mkEsScribe

268268 -> IndexName v

269269 -- ^ Treated as a prefix if index sharding is enabled

270270 -> MappingName v

271+ -> Value

272+ -- ^ Index mapping value. Use 'baseMapping' as default value

273+ -- constructor.

271274 -> PermitFunc

272275 -> Verbosity

273276 -> IO Scribe

274−mkEsScribe cfg@EsScribeCfg {..} env ix mapping permit verb = do

277+mkEsScribe cfg@EsScribeCfg {..} env ix mapping mappingValue permit verb = do

275278 q <- newTBMQueueIO $ unEsQueueSize essQueueSize

276279 endSig <- newEmptyMVar

277280

@@ -293,7 +296,7 @@ mkEsScribe cfg@EsScribeCfg {..} env ix mapping permit verb = do

293296 r1 <- createIndex prx essIndexSettings ix

294297 unless (statusIsSuccessful (responseStatus r1)) $

295298 liftIO $ EX.throwIO (CouldNotCreateIndex r1)

296− r2 <- putMapping prx ix mapping base

299+ r2 <- putMapping prx ix mapping mappingValue

297300 unless (statusIsSuccessful (responseStatus r2)) $

298301 liftIO $ EX.throwIO (CouldNotCreateMapping r2)

299302

@@ -318,8 +321,7 @@ mkEsScribe cfg@EsScribeCfg {..} env ix mapping permit verb = do

318321 shardingEnabled = case essIndexSharding of

319322 NoIndexSharding -> False

320323 _ -> True

321− tpl = toIndexTemplate prx (toTemplatePattern prx (ixn <> "-*")) (Just essIndexSettings) [toJSON base]

322− base = baseMapping prx mapping

324+ tpl = toIndexTemplate prx (toTemplatePattern prx (ixn <> "-*")) (Just essIndexSettings) [mappingValue]

323325 ixn = fromIndexName prx ix

324326 itemJson' :: LogItem a => Item a -> Value

325327 itemJson' i

katip-elasticsearch/test/Main.hs+3−1

@@ -161,7 +161,9 @@ setupSearch

161161setupSearch prx modScribeCfg = do

162162 bh prx (dropESSchema prx)

163163 mgr <- newManager defaultManagerSettings

164− mkEsScribe cfg (mkBHEnv prx (svr prx) mgr) (ixn prx) (mn prx) (permitItem DebugS) V3

164+ let mname = mn prx

165+ mkEsScribe cfg (mkBHEnv prx (svr prx) mgr) (ixn prx) mname (baseMapping prx mname)

166+ (permitItem DebugS) V3

165167 where

166168 cfg :: EsScribeCfg v

167169 cfg = modScribeCfg $