Merge branch 'bloodhound-versioning'
commit5fc2c6ac1f39ce38238a667bf3a6a38273920e69
authorMichael Xavier <michael@michaelxavier.net>
dateMon 20 Jul 2015, 09:14 (11 years ago)
parent6110f10ebadaa7
katip-elasticsearch/addSources.shnew file+4
@@ -0,0 +1,4 @@
1+set -e
2+cabal sandbox init
3+
4+cabal sandbox add-source ../katip
katip-elasticsearch/katip-elasticsearch.cabal+1−1
@@ -20,7 +20,7 @@ library
2020 build-depends:
2121 base >=4.6 && <4.9
2222 , katip
23− , bloodhound >= 0.6 && < 0.7
23+ , bloodhound >= 0.7.0.1 && < 0.8
2424 , random >= 1.0 && < 1.2
2525 , uuid >= 1.3 && < 1.4
2626 , aeson >=0.6 && <0.9
katip-elasticsearch/src/Katip/Scribes/ElasticSearch.hs+1−1
@@ -198,7 +198,7 @@ startWorker EsScribeCfg {..} env ix mapping q = go -- manual recursion here. is
198198 Nothing -> return ()
199199 sendLog v = void $ recovering essRetryPolicy [handler] $ do
200200 did <- mkDocId
201− runBH env $ indexDocument ix mapping v did
201+ runBH env $ indexDocument ix mapping defaultIndexDocumentSettings v did
202202 eat _ = return ()
203203 handler _ = Handler $ \e ->
204204 case fromException e of