Fixed Authentication doesn't work chrisdinn#67

damienlevin · Apr 24, 2016 · 83b7350 · 83b7350
1 parent efcc20d
commit 83b7350
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ In your build.sbt
 
     resolvers += "chrisdinn" at "http://chrisdinn.github.io/releases/"
 
-    libraryDependencies += "com.digital-achiever" %% "brando" % "3.0.3"
+    libraryDependencies += "com.digital-achiever" %% "brando" % "3.0.4"
 
 ### Getting started
 
@@ -244,7 +244,7 @@ It's possible to use sharding with Sentinel, to do so you need to use `SentinelS
 
 ## Documentation
 
-Read the API documentation here: [http://chrisdinn.github.io/api/brando-3.0.3/](http://chrisdinn.github.io/api/brando-3.0.3/)
+Read the API documentation here: [http://chrisdinn.github.io/api/brando-3.0.4/](http://chrisdinn.github.io/api/brando-3.0.4/)
 
 ## Mailing list
 

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ name := "brando"
 
 organization := "com.digital-achiever"
 
-version := "3.0.3"
+version := "3.0.4"
 
 scalaVersion := "2.11.4"
 

diff --git a/src/main/scala/Connection.scala b/src/main/scala/Connection.scala
@@ -114,14 +114,13 @@ private[brando] class Connection(
     case x: Tcp.Connected ⇒
       socket = sender
       socket ! Tcp.Register(self, useResumeWriting = false)
-      (self ? Request("PING"))(connectionTimeout) map {
+      (self ? Request("PING"))(connectionTimeout) onComplete {
+        case scala.util.Failure(_: AskTimeoutException) ⇒
+          listener ! ConnectionFailed(host, port)
         case _ ⇒
           listener ! Connected(host, port)
           heartbeatDelay map (d ⇒
             context.system.scheduler.schedule(0.seconds, 1.seconds, self, Heartbeat(d)))
-      } recover {
-        case _ ⇒
-          listener ! ConnectionFailed(host, port)
       }
 
     case Heartbeat(delay) ⇒