From b607ef650d300659ef700e7e69c62ed55907d63c Mon Sep 17 00:00:00 2001
From: koushiro <koushiro.cqx@gmail.com>
Date: Mon, 10 Feb 2020 20:23:27 +0800
Subject: [PATCH] Update to reqwest 0.10
Signed-off-by: koushiro <koushiro.cqx@gmail.com>
---
examples/example_hyper.rs | 59 +++++++++++++++++++++------------------
src/push.rs | 3 +-
2 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/examples/example_hyper.rs b/examples/example_hyper.rs
index a6eda1b..b478391 100644
--- a/examples/example_hyper.rs
+++ b/examples/example_hyper.rs
@@ -16,8 +16,11 @@ extern crate lazy_static;
#[macro_use]
extern crate prometheus;
-use hyper::{header::CONTENT_TYPE, rt::Future, service::service_fn_ok, Body, Response, Server};
-
+use hyper::{
+ header::CONTENT_TYPE,
+ service::{make_service_fn, service_fn},
+ Body, Request, Response, Server,
+};
use prometheus::{Counter, Encoder, Gauge, HistogramVec, TextEncoder};
lazy_static! {
@@ -41,36 +44,38 @@ lazy_static! {
.unwrap();
}
-fn main() {
- let addr = ([127, 0, 0, 1], 9898).into();
- println!("Listening address: {:?}", addr);
+async fn serve_req(_req: Request<Body>) -> Result<Response<Body>, hyper::Error> {
+ let encoder = TextEncoder::new();
- let new_service = || {
- let encoder = TextEncoder::new();
- service_fn_ok(move |_request| {
- HTTP_COUNTER.inc();
- let timer = HTTP_REQ_HISTOGRAM.with_label_values(&["all"]).start_timer();
+ HTTP_COUNTER.inc();
+ let timer = HTTP_REQ_HISTOGRAM.with_label_values(&["all"]).start_timer();
- let metric_families = prometheus::gather();
- let mut buffer = vec![];
- encoder.encode(&metric_families, &mut buffer).unwrap();
- HTTP_BODY_GAUGE.set(buffer.len() as f64);
+ let metric_families = prometheus::gather();
+ let mut buffer = vec![];
+ encoder.encode(&metric_families, &mut buffer).unwrap();
+ HTTP_BODY_GAUGE.set(buffer.len() as f64);
- let response = Response::builder()
- .status(200)
- .header(CONTENT_TYPE, encoder.format_type())
- .body(Body::from(buffer))
- .unwrap();
+ let response = Response::builder()
+ .status(200)
+ .header(CONTENT_TYPE, encoder.format_type())
+ .body(Body::from(buffer))
+ .unwrap();
- timer.observe_duration();
+ timer.observe_duration();
- response
- })
- };
+ Ok(response)
+}
+
+#[tokio::main]
+async fn main() {
+ let addr = ([127, 0, 0, 1], 9898).into();
+ println!("Listening on http://{}", addr);
- let server = Server::bind(&addr)
- .serve(new_service)
- .map_err(|e| eprintln!("Server error: {}", e));
+ let serve_future = Server::bind(&addr).serve(make_service_fn(|_| async {
+ Ok::<_, hyper::Error>(service_fn(serve_req))
+ }));
- hyper::rt::run(server);
+ if let Err(err) = serve_future.await {
+ eprintln!("server error: {}", err);
+ }
}
diff --git a/src/push.rs b/src/push.rs
index 525bc89..c18cbb0 100644
--- a/src/push.rs
+++ b/src/push.rs
@@ -17,8 +17,9 @@ use std::hash::BuildHasher;
use std::str::{self, FromStr};
use std::time::Duration;
+use reqwest::blocking::Client;
use reqwest::header::CONTENT_TYPE;
-use reqwest::{Client, Method, StatusCode, Url};
+use reqwest::{Method, StatusCode, Url};
use crate::encoder::{Encoder, ProtobufEncoder};
use crate::errors::{Error, Result};
--
2.25.0