summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork_bx <>2020-08-09 16:41:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2020-08-09 16:41:00 (GMT)
commit9977f7e5509da1d54a4026d281c6c70353afae04 (patch)
tree6797598f8adc08cf8cfe0986cc8e09e3dc737bbd
parent45b1f23edeafa6c5cd534a8ab549121bf0fdba92 (diff)
version 0.12.14HEAD0.12.14master
-rw-r--r--CHANGELOG4
-rw-r--r--hedis.cabal8
-rw-r--r--src/Database/Redis.hs5
-rw-r--r--src/Database/Redis/ProtocolPipelining.hs1
4 files changed, 14 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 016b26f..c575ce3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
# Changelog for Hedis
+## 0.12.14
+
+* PR #153. Publicly expose ConnectTimeout exception
+
## 0.12.13
* PR #150, Issue #143. Leaking sockets when connection fails
diff --git a/hedis.cabal b/hedis.cabal
index d0dcb51..ebfb21a 100644
--- a/hedis.cabal
+++ b/hedis.cabal
@@ -1,5 +1,5 @@
name: hedis
-version: 0.12.13
+version: 0.12.14
synopsis:
Client library for the Redis datastore: supports full command set,
pipelining.
@@ -43,7 +43,7 @@ maintainer: Kostiantyn Rybnikov <k-bx@k-bx.com>
copyright: Copyright (c) 2011 Falko Peters
category: Database
build-type: Simple
-cabal-version: >=1.8
+cabal-version: >=1.10
homepage: https://github.com/informatikr/hedis
bug-reports: https://github.com/informatikr/hedis/issues
extra-source-files: CHANGELOG
@@ -58,6 +58,7 @@ flag dev
manual: True
library
+ default-language: Haskell2010
hs-source-dirs: src
ghc-options: -Wall -fwarn-tabs
if impl(ghc >= 8.6.0)
@@ -102,6 +103,7 @@ library
Database.Redis.URL
benchmark hedis-benchmark
+ default-language: Haskell2010
type: exitcode-stdio-1.0
main-is: benchmark/Benchmark.hs
build-depends:
@@ -116,6 +118,7 @@ benchmark hedis-benchmark
ghc-prof-options: -auto-all
test-suite hedis-test
+ default-language: Haskell2010
type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: Test.hs
@@ -140,6 +143,7 @@ test-suite hedis-test
ghc-prof-options: -auto-all
test-suite doctest
+ default-language: Haskell2010
type: exitcode-stdio-1.0
main-is: DocTest.hs
ghc-options: -O0 -rtsopts
diff --git a/src/Database/Redis.hs b/src/Database/Redis.hs
index f723bf9..3112b10 100644
--- a/src/Database/Redis.hs
+++ b/src/Database/Redis.hs
@@ -178,7 +178,8 @@ module Database.Redis (
-- * Low-Level Command API
sendRequest,
- Reply(..),Status(..),RedisResult(..),ConnectionLostException(..),
+ Reply(..), Status(..), RedisResult(..), ConnectionLostException(..),
+ ConnectTimeout(..)
-- |[Solution to Exercise]
--
@@ -196,7 +197,7 @@ import Database.Redis.Core
import Database.Redis.PubSub
import Database.Redis.Protocol
import Database.Redis.ProtocolPipelining
- (PortID(..), ConnectionLostException(..))
+ (PortID(..), ConnectionLostException(..), ConnectTimeout(..))
import Database.Redis.Transactions
import Database.Redis.Types
import Database.Redis.URL
diff --git a/src/Database/Redis/ProtocolPipelining.hs b/src/Database/Redis/ProtocolPipelining.hs
index 1e6388d..6492677 100644
--- a/src/Database/Redis/ProtocolPipelining.hs
+++ b/src/Database/Redis/ProtocolPipelining.hs
@@ -20,6 +20,7 @@ module Database.Redis.ProtocolPipelining (
Connection,
connect, enableTLS, beginReceiving, disconnect, request, send, recv, flush,
ConnectionLostException(..),
+ ConnectTimeout(..),
PortID(..)
) where