diff --git a/README.markdown b/README.markdown --- a/README.markdown +++ b/README.markdown @@ -12,9 +12,9 @@ and other improvements. Please report bugs via the -[github issue tracker](http://github.com/bos/riak-haskell-client/issues). +[github issue tracker](http://github.com/janrain/riak-haskell-client/issues). -Master [git repository](http://github.com/bos/riak-haskell-client): +Master [git repository](http://github.com/janrain/riak-haskell-client): * `git clone git://github.com/bos/riak-haskell-client.git` @@ -27,5 +27,7 @@ Authors ------- -This library is written and maintained by Bryan O'Sullivan, +This library was written by Bryan O'Sullivan, . +It is maintained by Nathan Hunter, + diff --git a/riak.cabal b/riak.cabal --- a/riak.cabal +++ b/riak.cabal @@ -1,5 +1,5 @@ name: riak -version: 0.7.0.1 +version: 0.7.0.2 synopsis: A Haskell client for the Riak decentralized data store description: A Haskell client library for the Riak decentralized data @@ -28,11 +28,11 @@ and decode data yourself, and handle all conflict resolution yourself. -homepage: http://github.com/bos/riak-haskell-client +homepage: http://github.com/janrain/riak-haskell-client license: OtherLicense license-file: LICENSE author: Bryan O'Sullivan -maintainer: Bryan O'Sullivan +maintainer: Nathan Hunter copyright: Copyright 2011 MailRank, Inc. Portions copyright 2007-2010 Basho Technologies, Inc. category: Network @@ -107,4 +107,4 @@ source-repository head type: git - location: http://github.com/bos/riak-haskell-client + location: http://github.com/janrain/riak-haskell-client diff --git a/src/Network/Riak.hs b/src/Network/Riak.hs --- a/src/Network/Riak.hs +++ b/src/Network/Riak.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Basic.hs b/src/Network/Riak/Basic.hs --- a/src/Network/Riak/Basic.hs +++ b/src/Network/Riak/Basic.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Basic -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Connection.hs b/src/Network/Riak/Connection.hs --- a/src/Network/Riak/Connection.hs +++ b/src/Network/Riak/Connection.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.Connection -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Connection/Internal.hs b/src/Network/Riak/Connection/Internal.hs --- a/src/Network/Riak/Connection/Internal.hs +++ b/src/Network/Riak/Connection/Internal.hs @@ -5,7 +5,7 @@ -- Module: Network.Riak.Connection.Internal -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- @@ -53,9 +53,11 @@ import Network.Riak.Types.Internal hiding (MessageTag(..)) import Network.Socket as Socket import Numeric (showHex) +import System.Mem.Weak (addFinalizer) import System.Random (randomIO) import Text.ProtocolBuffers (messageGetM, messagePutM, messageSize) import Text.ProtocolBuffers.Get (Get, Result(..), getWord32be, runGet) +import qualified Control.Exception as E import qualified Data.ByteString as B import qualified Data.ByteString.Lazy.Char8 as L import qualified Network.Riak.Types.Internal as T @@ -112,6 +114,7 @@ Socket.connect sock (addrAddress ai) buf <- newIORef L.empty let conn = Connection sock client buf + addFinalizer conn $ sClose sock -- Data.Pool doesn't guarantee our disconnect gets called... setClientID conn clientID return conn @@ -178,7 +181,7 @@ case mbs of Just bs -> step $ runGet get bs Nothing -> moduleError "recvGet" "socket closed" - + recvGetN :: Connection -> Int64 -> Get a -> IO a recvGetN conn n get = do bs <- recvExactly conn n @@ -340,7 +343,7 @@ onIOException :: String -> IO a -> IO a onIOException func act = - act `catch` \(e::IOException) -> do + act `E.catch` \(e::IOException) -> do let s = show e debug func $ "caught IO exception: " ++ s moduleError func s diff --git a/src/Network/Riak/Connection/NoPush.hsc b/src/Network/Riak/Connection/NoPush.hsc --- a/src/Network/Riak/Connection/NoPush.hsc +++ b/src/Network/Riak/Connection/NoPush.hsc @@ -4,7 +4,7 @@ -- Module: Network.Riak.Connection.NoPush -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- @@ -17,7 +17,7 @@ #include import Foreign.C.Error (throwErrnoIfMinus1_) -import Foreign.C.Types (CInt) +import Foreign.C.Types (CInt(..)) import Foreign.Marshal.Utils (with) import Foreign.Ptr (Ptr) import Foreign.Storable (sizeOf) diff --git a/src/Network/Riak/Connection/Pool.hs b/src/Network/Riak/Connection/Pool.hs --- a/src/Network/Riak/Connection/Pool.hs +++ b/src/Network/Riak/Connection/Pool.hs @@ -5,7 +5,7 @@ -- Module: Network.Riak.Connection.Pool -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Content.hs b/src/Network/Riak/Content.hs --- a/src/Network/Riak/Content.hs +++ b/src/Network/Riak/Content.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Content -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Debug.hs b/src/Network/Riak/Debug.hs --- a/src/Network/Riak/Debug.hs +++ b/src/Network/Riak/Debug.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Debug -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Escape.hs b/src/Network/Riak/Escape.hs --- a/src/Network/Riak/Escape.hs +++ b/src/Network/Riak/Escape.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Connection -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Functions.hs b/src/Network/Riak/Functions.hs --- a/src/Network/Riak/Functions.hs +++ b/src/Network/Riak/Functions.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.Functions -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/JSON.hs b/src/Network/Riak/JSON.hs --- a/src/Network/Riak/JSON.hs +++ b/src/Network/Riak/JSON.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.JSON -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/JSON/Resolvable.hs b/src/Network/Riak/JSON/Resolvable.hs --- a/src/Network/Riak/JSON/Resolvable.hs +++ b/src/Network/Riak/JSON/Resolvable.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.JSON.Resolvable -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Request.hs b/src/Network/Riak/Request.hs --- a/src/Network/Riak/Request.hs +++ b/src/Network/Riak/Request.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Request -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Resolvable.hs b/src/Network/Riak/Resolvable.hs --- a/src/Network/Riak/Resolvable.hs +++ b/src/Network/Riak/Resolvable.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.Resolvable -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Resolvable/Internal.hs b/src/Network/Riak/Resolvable/Internal.hs --- a/src/Network/Riak/Resolvable/Internal.hs +++ b/src/Network/Riak/Resolvable/Internal.hs @@ -3,7 +3,7 @@ -- Module: Network.Riak.Resolvable.Internal -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Response.hs b/src/Network/Riak/Response.hs --- a/src/Network/Riak/Response.hs +++ b/src/Network/Riak/Response.hs @@ -4,7 +4,7 @@ -- Module: Network.Riak.Request -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Tag.hs b/src/Network/Riak/Tag.hs --- a/src/Network/Riak/Tag.hs +++ b/src/Network/Riak/Tag.hs @@ -5,7 +5,7 @@ -- Module: Network.Riak.Content -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Types.hs b/src/Network/Riak/Types.hs --- a/src/Network/Riak/Types.hs +++ b/src/Network/Riak/Types.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.Types -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Types/Internal.hs b/src/Network/Riak/Types/Internal.hs --- a/src/Network/Riak/Types/Internal.hs +++ b/src/Network/Riak/Types/Internal.hs @@ -5,7 +5,7 @@ -- Module: Network.Riak.Types.Internal -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Value.hs b/src/Network/Riak/Value.hs --- a/src/Network/Riak/Value.hs +++ b/src/Network/Riak/Value.hs @@ -5,7 +5,7 @@ -- Module: Network.Riak.Value -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable -- diff --git a/src/Network/Riak/Value/Resolvable.hs b/src/Network/Riak/Value/Resolvable.hs --- a/src/Network/Riak/Value/Resolvable.hs +++ b/src/Network/Riak/Value/Resolvable.hs @@ -2,7 +2,7 @@ -- Module: Network.Riak.Value.Resolvable -- Copyright: (c) 2011 MailRank, Inc. -- License: Apache --- Maintainer: Bryan O'Sullivan +-- Maintainer: Nathan Hunter -- Stability: experimental -- Portability: portable --