Skip to content

Commit

Permalink
fix(tonic): change connect_lazy to be infallible (#712)
Browse files Browse the repository at this point in the history
Co-authored-by: Lucio Franco <[email protected]>
  • Loading branch information
nbaztec and LucioFranco authored Oct 20, 2021
1 parent 53ecc1f commit 2e47154
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ This release includes a new crate `tonic-web` which is versioned at `0.1` and su
* **transport:** provide generic access to connect info ([#647](https://github.com/hyperium/tonic/issues/647)) ([e5e3118](https://github.com/hyperium/tonic/commit/e5e311853bff347355722bc829d40f54e8954aee))



# [0.4.3](https://github.com/hyperium/tonic/compare/v0.4.2...v0.4.3) (2021-04-29)

### Features
Expand Down
4 changes: 1 addition & 3 deletions tests/integration_tests/tests/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ async fn connect_lazy_reconnects_after_first_failure() {
let sender = Arc::new(Mutex::new(Some(tx)));
let svc = test_server::TestServer::new(Svc(sender));

let channel = Endpoint::from_static("http://127.0.0.1:1339")
.connect_lazy()
.unwrap();
let channel = Endpoint::from_static("http://127.0.0.1:1339").connect_lazy();

let mut client = TestClient::new(channel);

Expand Down
6 changes: 3 additions & 3 deletions tonic/src/transport/channel/endpoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ impl Endpoint {
///
/// The channel returned by this method does not attempt to connect to the endpoint until first
/// use.
pub fn connect_lazy(&self) -> Result<Channel, Error> {
pub fn connect_lazy(&self) -> Channel {
let mut http = hyper::client::connect::HttpConnector::new();
http.enforce_http(false);
http.set_nodelay(self.tcp_nodelay);
Expand All @@ -299,9 +299,9 @@ impl Endpoint {
if let Some(connect_timeout) = self.connect_timeout {
let mut connector = hyper_timeout::TimeoutConnector::new(connector);
connector.set_connect_timeout(Some(connect_timeout));
Ok(Channel::new(connector, self.clone()))
Channel::new(connector, self.clone())
} else {
Ok(Channel::new(connector, self.clone()))
Channel::new(connector, self.clone())
}
}

Expand Down

0 comments on commit 2e47154

Please sign in to comment.