on master help sign in
checking
commit6795822dc718fe4ab8d3161036bf37bb3ed978ca authorAlexey Uimanov <s9gf4ult@gmail.com> dateFri 2 Aug 2019, 17:59 (7 years ago) parent78c85ee
2 files changed+23−4
katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Internal.hs+4−3 stack.yaml+19−1
katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Internal.hs+4−3
@@ -28,7 +28,7 @@ import Control.Retry (RetryPolicy,
2828 recovering)
2929import Data.Aeson
3030import Data.ByteString.Lazy (ByteString)
31−import Data.List.NonEmpty (NonEmpty(..))
31+import Data.List.NonEmpty (NonEmpty (..))
3232import Data.Monoid ((<>))
3333import Data.Text (Text)
3434import qualified Data.Text as T
@@ -266,13 +266,14 @@ mkEsScribe
266266 )
267267 => EsScribeCfg v
268268 -> BHEnv v
269+ -> (ESVersion v => proxy v -> MappingName v -> Value)
269270 -> IndexName v
270271 -- ^ Treated as a prefix if index sharding is enabled
271272 -> MappingName v
272273 -> Severity
273274 -> Verbosity
274275 -> IO Scribe
275−mkEsScribe cfg@EsScribeCfg {..} env ix mapping sev verb = do
276+mkEsScribe cfg@EsScribeCfg {..} env indexMapper ix mapping sev verb = do
276277 q <- newTBMQueueIO $ unEsQueueSize essQueueSize
277278 endSig <- newEmptyMVar
278279
@@ -320,7 +321,7 @@ mkEsScribe cfg@EsScribeCfg {..} env ix mapping sev verb = do
320321 NoIndexSharding -> False
321322 _ -> True
322323 tpl = toIndexTemplate prx (toTemplatePattern prx (ixn <> "-*")) (Just essIndexSettings) [toJSON base]
323− base = baseMapping prx mapping
324+ base = indexMapper prx mapping
324325 ixn = fromIndexName prx ix
325326 itemJson' :: LogItem a => Item a -> Value
326327 itemJson' i
stack.yaml+19−1
@@ -1,10 +1,28 @@
1−resolver: lts-11.14
1+# resolver: lts-11.14
2+resolver: lts-13.21
23packages:
34 - katip
45 - katip-elasticsearch
6+
57extra-deps:
68 - bloodhound-0.16.0.0
9+ - containers-0.5.11.0
10+ - derive-2.6.5
11+ - libssh2-0.2.0.7
12+ - mersenne-random-1.0.0.1
13+ - open-union-0.3.0.0
14+ - proto-lens-0.5.0.0
15+ - proto-lens-protobuf-types-0.5.0.0
16+ - proto-lens-protoc-0.5.0.0
17+ - proto-lens-runtime-0.5.0.0
18+ - proto-lens-setup-0.4.0.2
19+ - binary-0.8.7.0
20+ - quickcheck-arbitrary-template-0.2.0.0
21+ - quickcheck-properties-0.1
22+ - transformers-0.5.6.2
723 - unliftio-core-0.1.2.0
24+ - writer-cps-transformers-0.1.1.4
25+
826flags:
927 katip:
1028 lib-Werror: true