Fixes for Timer and TimePeriod usage

src/connection/connection.jl

@@ -118,13 +118,13 @@ function ping(nc; timeout::Union{Real, Period} = 1.0, measure = true)
     last_pong_count = @atomic nc.pong_count
     start_time = time()
     send(nc, Ping())
-    result = timedwait(Second(timeout); pollint = Millisecond(1)) do
+    result = timedwait(timeout; pollint = 0.001) do
         (@atomic nc.pong_count) != last_pong_count
     end
     result == :timed_out && error("No PONG received in specified timeout ($timeout seconds).")
     result == :ok || error("Unexpected status symbol: :$result")
     if measure && (@atomic nc.pong_received_at) > 0.0
-        @info "Measured ping time is $(1000 * (nc.pong_received_at - start_time)) milliseconds"
+        @info "Measured ping time is $(1000 * ((@atomic nc.pong_received_at) - start_time)) milliseconds"
     end
     Pong()
 end

src/connection/drain.jl

@@ -17,8 +17,8 @@
 ### Code:
 
 # Actual drain logic, for thread safety executed in connection controller task.
-function _do_drain(nc::Connection, is_connected::Bool; timeout::Union{Real, TimePeriod} = nc.drain_timeout)
-    timer = Timer(Second(timeout))
+function _do_drain(nc::Connection, is_connected::Bool; timeout::Union{Real, Period} = nc.drain_timeout)
+    timer = Timer(timeout)
     sids = @lock nc.lock copy(keys(nc.sub_data))
     for sid in sids
         send(nc, Unsub(sid, 0))

src/pubsub/drain.jl

@@ -31,7 +31,7 @@ Optional keyword arguments:
 - `timeout`: error will be thrown if drain not finished until `timeout` expires. Default value is configurable per connection on `connect` with `drain_timeout`. Can be also set globally with `NATS_DRAIN_TIMEOUT_SECONDS` environment variable. If not set explicitly default drain timeout is `$DEFAULT_DRAIN_TIMEOUT_SECONDS` seconds.
 """
 function drain(connection::Connection, sub::Sub; timeout::Union{Real, Period} = connection.drain_timeout)
-    timer = Timer(Second(timeout))
+    timer = Timer(timeout)
     sub_stats = stats(connection, sub)
     if isnothing(sub_stats)
         return # Already drained.

src/reqreply/request.jl

@@ -83,9 +83,10 @@ function request(
     sub = subscribe(connection, reply_to)
     unsubscribe(connection, sub; max_msgs = nreplies)
     publish(connection, subject, data; reply_to)
-    timer = Timer(Second(timeout).value) do _ # TODO: get rid of .value in 1.11
-        drain(connection, sub)
+    if timeout isa Period # TODO: get rid of if in 1.11
+        timeout = Nanosecond(timeout) / Nanosecond(Second(1))
     end
+    timer = Timer(timeout) do _; drain(connection, sub) end
     result = Msg[]
     for _ in 1:nreplies
         msg = next(connection, sub; no_throw = true)