From 862f25500d0a60c0c7e8ef35cb6f72a17cfcf717 Mon Sep 17 00:00:00 2001 From: Efim Poberezkin <8711996+efim-poberezkin@users.noreply.github.com> Date: Thu, 9 Sep 2021 01:30:39 +1000 Subject: [PATCH] v4 (#192) --- package.yaml | 2 +- .../smp-server-digitalocean-droplet/marketplace-image.json | 2 +- simplexmq.cabal | 4 ++-- src/Simplex/Messaging/Agent.hs | 2 +- tests/SMPAgentClient.hs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.yaml b/package.yaml index 88889931c..7732f9629 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: simplexmq -version: 0.3.2 +version: 0.4.0 synopsis: SimpleXMQ message broker description: | This package includes <./docs/Simplex-Messaging-Server.html server>, diff --git a/scripts/smp-server-digitalocean-droplet/marketplace-image.json b/scripts/smp-server-digitalocean-droplet/marketplace-image.json index e42fa3448..c85dccc53 100644 --- a/scripts/smp-server-digitalocean-droplet/marketplace-image.json +++ b/scripts/smp-server-digitalocean-droplet/marketplace-image.json @@ -3,7 +3,7 @@ "token": "{{env `DIGITALOCEAN_TOKEN`}}", "image_name": "smp-server-snapshot", "application_name": "SMP server", - "release_tag": "v0.3.2" + "release_tag": "v0.4.0" }, "sensitive-variables": ["token"], "builders": [ diff --git a/simplexmq.cabal b/simplexmq.cabal index c34c18ef6..30ff89c34 100644 --- a/simplexmq.cabal +++ b/simplexmq.cabal @@ -4,10 +4,10 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 5169db4a4922766c79f08cbdb91d4c765520372273ab432569eba25a253a8dbb +-- hash: e25d53dc1b12c8bcdf029091182613198be5271348ea19174b6532d820fe1fc9 name: simplexmq -version: 0.3.2 +version: 0.4.0 synopsis: SimpleXMQ message broker description: This package includes <./docs/Simplex-Messaging-Server.html server>, <./docs/Simplex-Messaging-Client.html client> and diff --git a/src/Simplex/Messaging/Agent.hs b/src/Simplex/Messaging/Agent.hs index 6b003250c..fe52e7fef 100644 --- a/src/Simplex/Messaging/Agent.hs +++ b/src/Simplex/Messaging/Agent.hs @@ -106,7 +106,7 @@ runSMPAgentBlocking (ATransport t) started cfg@AgentConfig {tcpPort} = runReader where smpAgent :: forall c m'. (Transport c, MonadUnliftIO m', MonadReader Env m') => TProxy c -> m' () smpAgent _ = runTransportServer started tcpPort $ \(h :: c) -> do - liftIO $ putLn h "Welcome to SMP v0.3.2 agent" + liftIO $ putLn h "Welcome to SMP v0.4.0 agent" c <- getAgentClient logConnection c True race_ (connectClient h c) (runAgentClient c) diff --git a/tests/SMPAgentClient.hs b/tests/SMPAgentClient.hs index f967368b1..b1c37288c 100644 --- a/tests/SMPAgentClient.hs +++ b/tests/SMPAgentClient.hs @@ -189,7 +189,7 @@ testSMPAgentClientOn :: (Transport c, MonadUnliftIO m) => ServiceName -> (c -> m testSMPAgentClientOn port' client = do runTransportClient agentTestHost port' $ \h -> do line <- liftIO $ getLn h - if line == "Welcome to SMP v0.3.2 agent" + if line == "Welcome to SMP v0.4.0 agent" then client h else error $ "wrong welcome message: " <> B.unpack line