Skip to content

Commit 9cbb237

Browse files
author
Artyom Kazak
authored
Use network-2.7 for more informative "connection failed" errors (wireapp#586)
* Use network-2.7 * Fix compilation, better comments
1 parent 8d685c2 commit 9cbb237

3 files changed

Lines changed: 10 additions & 1 deletion

File tree

stack.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ extra-deps:
149149
- network-uri-static-0.1.1.0
150150
- list-t-1.0.1 # 1.0.0.1 doesn't build
151151
- unliftio-0.2.10 # for pooled concurrency utils in UnliftIO.Async
152+
- network-2.7.0.2 # to get nicer errors when connections fail
153+
- HaskellNet-SSL-0.3.4.1 # first version to support network-2.7
152154

153155
# the following are just not on Stackage (and most of these were present in
154156
# LTS-11 but got evicted in LTS-12)

tools/bonanza/src/Bonanza/Metrics.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{-# LANGUAGE OverloadedStrings #-}
22
{-# LANGUAGE RecordWildCards #-}
33

4+
-- Network.BSD got deprecated in network-2.7; this line won't be needed once we
5+
-- move to network-3.0 because then we can use the network-bsd package
6+
{-# OPTIONS_GHC -Wno-deprecations #-}
7+
48
module Bonanza.Metrics
59
( Stats (..)
610
, debugCollectd

tools/bonanza/src/Bonanza/Streaming/Kibana.hs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
{-# LANGUAGE StandaloneDeriving #-}
77

88
-- necessary because of missing 'Eq ZonedTime' instance
9-
{-# OPTIONS_GHC -fno-warn-orphans #-}
9+
{-# OPTIONS_GHC -fno-warn-orphans #-}
10+
-- Network.BSD got deprecated in network-2.7; this line won't be needed once we
11+
-- move to network-3.0 because then we can use the network-bsd package
12+
{-# OPTIONS_GHC -Wno-deprecations #-}
1013

1114
module Bonanza.Streaming.Kibana
1215
( KibanaEvent

0 commit comments

Comments
 (0)