# HG changeset patch # User Matt Johnston # Date 1512490185 -28800 # Node ID efcbe0d3afd64a44d0417152e1f7f149182e1979 # Parent 8152ef251dbbd295982f33a588a784b6e5d46422 fix to work with hyper diff -r 8152ef251dbb -r efcbe0d3afd6 rust/Cargo.toml --- a/rust/Cargo.toml Wed Dec 06 00:08:46 2017 +0800 +++ b/rust/Cargo.toml Wed Dec 06 00:09:45 2017 +0800 @@ -17,14 +17,12 @@ time = "0.1" lazy_static = "0.2" regex = "0.2" -tokio-curl = "0.1" toml = "0.3" -curl = "0.4" +hyper = "0.11" serde_json = "0.9" base64 = "0.4" libc = "0.2" atomicwrites = "0.1" -# linux only -[target.linux.dependencies] +[target.'cfg(target_os = "linux")'.dependencies] sysfs_gpio = "0.5" diff -r 8152ef251dbb -r efcbe0d3afd6 rust/src/fridge.rs --- a/rust/src/fridge.rs Wed Dec 06 00:08:46 2017 +0800 +++ b/rust/src/fridge.rs Wed Dec 06 00:09:45 2017 +0800 @@ -1,6 +1,6 @@ extern crate futures; extern crate tokio_core; -#[cfg(linux)] +#[cfg(target_os = "linux")] extern crate sysfs_gpio; use std; @@ -14,7 +14,7 @@ use futures::sync::{mpsc}; #[cfg(target_os = "linux")] -use sysfs_gpio::{Direction, Pin}; +use self::sysfs_gpio::{Direction, Pin}; use config::Config; use params::Params; @@ -138,11 +138,10 @@ /// All specified in next_wakeup() pub fn wakeups(&mut self) -> Box> { - mem::replace(&mut self.timeout_r, None) + Box::new(mem::replace(&mut self.timeout_r, None) .expect("Fridge::wakeups() can only be called once") .map(|v| Message::Tick(v)) - .map_err(|e| TemplogError::new("wakeups() receive failed")) - .boxed() + .map_err(|e| TemplogError::new("wakeups() receive failed"))) } fn turn_off(&mut self) { diff -r 8152ef251dbb -r efcbe0d3afd6 rust/src/main.rs --- a/rust/src/main.rs Wed Dec 06 00:08:46 2017 +0800 +++ b/rust/src/main.rs Wed Dec 06 00:09:45 2017 +0800 @@ -5,11 +5,10 @@ extern crate env_logger; extern crate rustc_serialize; extern crate time; -extern crate tokio_curl; -extern crate curl; extern crate serde_json; extern crate libc; extern crate atomicwrites; +extern crate hyper; #[macro_use] extern crate lazy_static; diff -r 8152ef251dbb -r efcbe0d3afd6 rust/src/params.rs --- a/rust/src/params.rs Wed Dec 06 00:08:46 2017 +0800 +++ b/rust/src/params.rs Wed Dec 06 00:09:45 2017 +0800 @@ -17,11 +17,12 @@ use tokio_core::reactor::Interval; use tokio_core::reactor::Handle; -use tokio_curl::Session; use futures::{Stream,Future,future}; -use curl::easy::Easy; -use curl::easy; use self::rand::Rng; +use std::str::FromStr; +use hyper; +use hyper::header::{Headers, ETag, EntityTag}; +use hyper::client::Client; use types::*; use ::Config; @@ -77,7 +78,6 @@ limitlog: NotTooOften, // last_etag is used for long-polling. last_etag: RefCell, - session: RefCell>, epoch: String, config: Config, @@ -89,63 +89,43 @@ const TIMEOUT_MINUTES: u64 = 5; impl ParamWaiter { - fn make_request(&self) -> (Easy, Arc>>) { - let mut req = Easy::new(); - req.get(true).unwrap(); - // supposedly req.url won't fail, checking happens later? - req.url(&self.config.SETTINGS_URL).unwrap(); - - req.timeout(Duration::new(TIMEOUT_MINUTES * 60, 0)).unwrap(); - - // store response - let max_response_size = 10000; - let buf = Arc::new(Mutex::new(Vec::new())); - let dst = buf.clone(); - req.write_function(move |data| { - let mut dst = dst.lock().unwrap(); - dst.extend_from_slice(data); - if dst.len() > max_response_size { - error!("Too large params response from server: {}", dst.len()); - Ok(0) - } else { - Ok(data.len()) - } - }).unwrap(); - - // http header - let e = self.last_etag.borrow(); - if !e.is_empty() { - let mut list = easy::List::new(); - let hd = format!("etag: {}", *e); - list.append(&hd).unwrap(); - req.http_headers(list).unwrap(); + fn make_request(&self) -> hyper::client::FutureResponse { + let uri = self.config.SETTINGS_URL.parse().expect("Bad SETTINGS_URL in config"); + let mut req = hyper::client::Request::new(hyper::Method::Get, uri); + { + let mut headers = req.headers_mut(); + headers.set(hyper::header::ETag(EntityTag::new(false, self.last_etag.borrow().clone()))); } - - (req, buf) + hyper::client::Client::new(&self.handle).request(req) + // XXX how do we do this? + // req.timeout(Duration::new(TIMEOUT_MINUTES * 60, 0)).unwrap(); } - fn handle_response(&self, req: &mut Easy, buf: &Vec) -> Result { - let text = String::from_utf8_lossy(buf).to_string(); - let resp = req.response_code()?; - match resp { - 200 => { + + fn handle_response(&self, buf : hyper::Chunk, status: hyper::StatusCode) -> Result { + let text = String::from_utf8_lossy(buf.as_ref()); + match status { + hyper::StatusCode::Ok => { // new params let r: Response = serde_json::from_str(&text)?; let mut le = self.last_etag.borrow_mut(); *le = r.etag; - if le.split('-').next().unwrap() == &self.epoch { - self.write_params(&r.params); - Ok(r.params) - } else { - Err(TemplogError::new(&format!("Bad epoch from server '{}' expected '{}'", *le, self.epoch))) + + // update params if the epoch is correct + if let Some(e) = le.split('-').next() { + if e == &self.epoch { + self.write_params(&r.params); + return Ok(r.params); + } } + Err(TemplogError::new(&format!("Bad epoch from server '{}' expected '{}'", *le, self.epoch))) } - 304 => { + hyper::StatusCode::NotModified => { // XXX this isn't really an error Err(TemplogError::new("304 unmodified (long polling timeout at the server)")) }, _ => { - Err(TemplogError::new(&format!("Wrong server response code {}: {}", resp, text))) + Err(TemplogError::new(&format!("Wrong server response code {}: {}", status.as_u16(), text))) }, } } @@ -158,31 +138,27 @@ } fn step(rself: Rc) -> Box> { - - if rself.session.borrow().is_none() { - *rself.session.borrow_mut() = Some(Session::new(rself.handle.clone())); - } - - let (mut req, buf) = rself.make_request(); + let resp = rself.make_request(); - let ses = rself.session.borrow().clone().unwrap(); - let s = ses.perform(req) - .map_err(|e| TemplogError::new_io("tokio curl error", e.into_error())) - .and_then(move |mut rq| { - let result = buf.lock().unwrap(); - rself.handle_response(&mut rq, &result) - }); + let s = resp.map_err(|e| TemplogError::new_hyper("response", e)) + .and_then(move |r| { + let status = r.status(); + r.body().concat2() + .map_err(|e| TemplogError::new_hyper("body", e)) + .and_then(move |b| { + rself.handle_response(b, status) + }) + }); Box::new(s) } fn new(config: &Config, handle: &Handle) -> Self { let mut b = [0u8; 15]; // 15 bytes -> 20 characters base64 - rand::OsRng::new().unwrap().fill_bytes(&mut b); + rand::OsRng::new().expect("Opening system RNG failed").fill_bytes(&mut b); let epoch = base64::encode(&b); ParamWaiter { limitlog: NotTooOften::new(LOG_MINUTES*60), last_etag: RefCell::new(String::new()), - session: RefCell::new(None), epoch: epoch, config: config.clone(), handle: handle.clone(), diff -r 8152ef251dbb -r efcbe0d3afd6 rust/src/types.rs --- a/rust/src/types.rs Wed Dec 06 00:08:46 2017 +0800 +++ b/rust/src/types.rs Wed Dec 06 00:09:45 2017 +0800 @@ -11,7 +11,7 @@ use futures::{Stream,IntoFuture}; use serde::{Deserialize,Serialize}; use toml; -use curl; +use hyper; use serde_json; #[derive(Debug)] @@ -42,7 +42,7 @@ ParseFloat(std::num::ParseFloatError), TomlDe(toml::de::Error), SerdeJson(serde_json::Error), - Curl(curl::Error), + Hyper(hyper::Error), } #[derive(Debug)] @@ -64,7 +64,7 @@ TemplogErrorKind::ParseFloat(ref e) => Some(e), TemplogErrorKind::TomlDe(ref e) => Some(e), TemplogErrorKind::SerdeJson(ref e) => Some(e), - TemplogErrorKind::Curl(ref e) => Some(e), + TemplogErrorKind::Hyper(ref e) => Some(e), } } @@ -82,7 +82,7 @@ TemplogErrorKind::TomlDe(ref e) => write!(f, ": {}", e), TemplogErrorKind::SerdeJson(ref e) => write!(f, ": {}", e), TemplogErrorKind::ParseFloat(ref e) => write!(f, ": {}", e), - TemplogErrorKind::Curl(ref e) => write!(f, ": {}", e), + TemplogErrorKind::Hyper(ref e) => write!(f, ": {}", e), }; Ok(()) } @@ -105,8 +105,8 @@ TemplogError::new_kind(msg, TemplogErrorKind::ParseFloat(e)) } - pub fn new_curl(msg: &str, e: curl::Error) -> Self { - TemplogError::new_kind(msg, TemplogErrorKind::Curl(e)) + pub fn new_hyper(msg: &str, e: hyper::Error) -> Self { + TemplogError::new_kind(msg, TemplogErrorKind::Hyper(e)) } pub fn new_serde_json(msg: &str, e: serde_json::Error) -> Self { @@ -138,7 +138,7 @@ TemplogErrorKind::TomlDe(_) => "Templog toml error", TemplogErrorKind::SerdeJson(_) => "Templog Json decode error", TemplogErrorKind::ParseFloat(_) => "Templog parse error", - TemplogErrorKind::Curl(_) => "Templog curl http error", + TemplogErrorKind::Hyper(_) => "Templog http error", } } } @@ -161,9 +161,9 @@ } } -impl From for TemplogError { - fn from(e: curl::Error) -> Self { - TemplogError::new_curl("", e) +impl From for TemplogError { + fn from(e: hyper::Error) -> Self { + TemplogError::new_hyper("", e) } }