Mercurial > templog
annotate rust/src/params.rs @ 636:43eb3cfdf769 rust
some progress, better error handling
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Wed, 16 Oct 2019 22:33:06 +0800 |
| parents | 4424a8b30f9c |
| children | a9f353f488d0 |
| rev | line source |
|---|---|
| 592 | 1 use std::time::Duration; |
| 634 | 2 |
|
611
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
3 use std::str; |
| 634 | 4 |
| 5 | |
| 6 | |
| 7 use std::cell::{RefCell}; | |
|
624
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
8 use std::fs::File; |
|
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
9 use std::io::Read; |
| 627 | 10 |
| 633 | 11 use serde::{Serialize,Deserialize}; |
| 592 | 12 |
| 634 | 13 use rand::rngs::{OsRng}; |
| 14 use rand::{RngCore}; | |
| 15 | |
| 16 | |
| 17 use hyper; | |
| 633 | 18 |
| 634 | 19 // for try_concat() |
| 20 use futures::stream::TryStreamExt; | |
| 21 use futures::executor::block_on; | |
|
611
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
22 |
| 633 | 23 use riker::actors::*; |
| 24 | |
| 25 use super::types::*; | |
| 26 use super::config::Config; | |
| 592 | 27 |
| 615 | 28 #[derive(Deserialize, Serialize, Debug, Clone)] |
| 29 pub struct Params { | |
| 30 pub fridge_setpoint: f32, | |
| 31 pub fridge_difference: f32, | |
| 621 | 32 pub overshoot_delay: u64, |
| 615 | 33 pub overshoot_factor: f32, |
| 34 pub disabled: bool, | |
| 35 pub nowort: bool, | |
| 36 pub fridge_range_lower: f32, | |
| 37 pub fridge_range_upper: f32, | |
| 38 } | |
| 39 | |
| 40 impl Params { | |
| 41 pub fn defaults() -> Params { | |
| 42 Params { | |
| 43 fridge_setpoint: 16.0, | |
| 44 fridge_difference: 0.2, | |
| 45 overshoot_delay: 720, // 12 minutes | |
| 46 overshoot_factor: 1.0, | |
| 634 | 47 disabled: true, |
| 615 | 48 nowort: false, |
| 49 fridge_range_lower: 3.0, | |
| 50 fridge_range_upper: 3.0, | |
| 51 } | |
| 52 } | |
| 53 | |
|
624
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
54 fn try_load(filename: &str) -> Result<Params, TemplogError> { |
|
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
55 let mut s = String::new(); |
|
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
56 File::open(filename)?.read_to_string(&mut s)?; |
|
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
57 Ok(serde_json::from_str(&s)?) |
|
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
58 } |
|
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
59 |
| 615 | 60 pub fn load(config: &Config) -> Params { |
|
635
4424a8b30f9c
config crate wants everything to be lower case
Matt Johnston <matt@ucc.asn.au>
parents:
634
diff
changeset
|
61 Self::try_load(&config.params_file) |
|
624
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
62 .unwrap_or_else(|_| Params::defaults()) |
| 615 | 63 } |
| 633 | 64 |
| 615 | 65 } |
| 66 | |
|
593
bf138339d20a
fiddling with timeouts and closures
Matt Johnston <matt@ucc.asn.au>
parents:
592
diff
changeset
|
67 pub struct ParamWaiter { |
|
609
7bda01659426
not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
68 limitlog: NotTooOften, |
| 616 | 69 // last_etag is used for long-polling. |
| 70 last_etag: RefCell<String>, | |
| 71 epoch: String, | |
| 634 | 72 chan: Option<ChannelRef<Params>>, // TODO: a way to avoid Option? |
|
614
e1bab5b36352
using some refcells for the paramwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
613
diff
changeset
|
73 |
|
609
7bda01659426
not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
74 config: Config, |
| 592 | 75 } |
| 76 | |
|
611
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
77 const LOG_MINUTES: u64 = 15; |
|
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
78 const MAX_RESPONSE_SIZE: usize = 10000; |
|
614
e1bab5b36352
using some refcells for the paramwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
613
diff
changeset
|
79 const TIMEOUT_MINUTES: u64 = 5; |
|
609
7bda01659426
not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
80 |
|
593
bf138339d20a
fiddling with timeouts and closures
Matt Johnston <matt@ucc.asn.au>
parents:
592
diff
changeset
|
81 impl ParamWaiter { |
| 633 | 82 |
| 634 | 83 pub fn new(config: Config) -> Self { |
| 633 | 84 let mut b = [0u8; 15]; // 15 bytes -> 20 characters base64 |
| 85 OsRng.fill_bytes(&mut b); | |
| 86 let epoch = base64::encode(&b); | |
| 87 | |
| 88 ParamWaiter { | |
| 89 limitlog: NotTooOften::new(LOG_MINUTES*60), | |
| 90 last_etag: RefCell::new(String::new()), | |
| 91 epoch: epoch, | |
| 634 | 92 chan: None, |
| 633 | 93 config: config, |
|
614
e1bab5b36352
using some refcells for the paramwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
613
diff
changeset
|
94 } |
|
609
7bda01659426
not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
95 } |
|
7bda01659426
not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
96 |
| 634 | 97 async fn wait_updates(uri: &str, etag: &str) -> Result<(hyper::Chunk, hyper::StatusCode), TemplogError> { |
| 98 let req = hyper::Request::get(uri) | |
| 99 .header(hyper::header::ETAG, etag)//*self.last_etag.borrow()) | |
| 100 .body(hyper::Body::from("")).unwrap(); | |
| 633 | 101 |
| 634 | 102 // TODO timeout? |
| 103 let resp = hyper::Client::new().request(req).await?; | |
| 104 let status = resp.status(); | |
| 105 let chunk = resp.into_body().try_concat().await?; | |
| 633 | 106 |
| 634 | 107 Ok((chunk, status)) |
| 633 | 108 } |
| 109 | |
| 626 | 110 fn handle_response(&self, buf : hyper::Chunk, status: hyper::StatusCode) -> Result<Params, TemplogError> { |
| 634 | 111 |
| 633 | 112 #[derive(Deserialize, Debug)] |
| 113 struct Response { | |
| 114 // sent as an opaque etag: header. Has format "epoch-nonce", | |
| 115 // responses where the epoch do not match ParamWaiter::epoch are dropped | |
| 116 etag: String, | |
| 117 params: Params, | |
| 118 } | |
| 119 | |
| 626 | 120 match status { |
| 634 | 121 hyper::StatusCode::OK => { |
|
613
5c2b0d47bb83
Response has epoch_tag and params
Matt Johnston <matt@ucc.asn.au>
parents:
611
diff
changeset
|
122 // new params |
| 634 | 123 let r: Response = serde_json::from_slice(&buf)?; |
|
618
2d65a9f0bed3
params returning stream of success
Matt Johnston <matt@ucc.asn.au>
parents:
616
diff
changeset
|
124 let mut le = self.last_etag.borrow_mut(); |
|
2d65a9f0bed3
params returning stream of success
Matt Johnston <matt@ucc.asn.au>
parents:
616
diff
changeset
|
125 *le = r.etag; |
| 626 | 126 |
| 127 // update params if the epoch is correct | |
| 128 if let Some(e) = le.split('-').next() { | |
| 129 if e == &self.epoch { | |
| 130 self.write_params(&r.params); | |
| 131 return Ok(r.params); | |
| 132 } | |
|
618
2d65a9f0bed3
params returning stream of success
Matt Johnston <matt@ucc.asn.au>
parents:
616
diff
changeset
|
133 } |
| 626 | 134 Err(TemplogError::new(&format!("Bad epoch from server '{}' expected '{}'", *le, self.epoch))) |
|
613
5c2b0d47bb83
Response has epoch_tag and params
Matt Johnston <matt@ucc.asn.au>
parents:
611
diff
changeset
|
135 } |
| 634 | 136 hyper::StatusCode::NOT_MODIFIED => { |
| 629 | 137 // XXX this isn't really an error. Should handle_response() return |
| 138 // Result<Option<Params>, TemplogError> instead? | |
|
618
2d65a9f0bed3
params returning stream of success
Matt Johnston <matt@ucc.asn.au>
parents:
616
diff
changeset
|
139 Err(TemplogError::new("304 unmodified (long polling timeout at the server)")) |
|
2d65a9f0bed3
params returning stream of success
Matt Johnston <matt@ucc.asn.au>
parents:
616
diff
changeset
|
140 }, |
|
611
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
141 _ => { |
| 634 | 142 let text = String::from_utf8_lossy(buf.as_ref()); |
| 626 | 143 Err(TemplogError::new(&format!("Wrong server response code {}: {}", status.as_u16(), text))) |
|
611
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
144 }, |
|
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
145 } |
|
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
146 } |
|
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
147 |
|
624
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
148 fn write_params(&self, params: &Params) { |
|
635
4424a8b30f9c
config crate wants everything to be lower case
Matt Johnston <matt@ucc.asn.au>
parents:
634
diff
changeset
|
149 let p = atomicwrites::AtomicFile::new(&self.config.params_file, atomicwrites::AllowOverwrite); |
|
624
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
150 p.write(|f| { |
|
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
151 serde_json::to_writer(f, params) |
|
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
152 }); |
|
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
153 } |
| 634 | 154 |
| 155 fn do_poll(&mut self, ctx: &Context<<Self as Actor>::Msg>) -> Result<(), TemplogError> { | |
|
635
4424a8b30f9c
config crate wants everything to be lower case
Matt Johnston <matt@ucc.asn.au>
parents:
634
diff
changeset
|
156 let url = self.config.settings_url.clone(); |
| 634 | 157 let etag = self.last_etag.borrow().clone(); |
| 158 let h = ctx.run(async move { | |
| 159 Self::wait_updates(&url, &etag).await | |
| 160 }).expect("spawn failed"); // XXX error handling | |
| 161 let (chunk, stat) = block_on(h)?; | |
| 162 let new_params = self.handle_response(chunk, stat)?; | |
| 163 self.chan.as_ref().unwrap().tell(Publish{msg: new_params, topic: "params".into()}, None); | |
| 164 Ok(()) | |
| 165 } | |
| 633 | 166 } |
|
624
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
621
diff
changeset
|
167 |
| 634 | 168 #[derive(Clone,Debug)] |
| 169 pub struct PollForParams; | |
| 170 | |
| 633 | 171 impl Actor for ParamWaiter { |
| 634 | 172 type Msg = PollForParams; |
|
611
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
173 |
| 634 | 174 fn recv(&mut self, |
| 175 ctx: &Context<Self::Msg>, | |
| 176 _msg: Self::Msg, | |
| 177 _sender: Sender) { | |
| 178 // schedule a retry once this iteration finishes | |
| 179 ctx.schedule_once(Duration::from_secs(1), ctx.myself(), None, PollForParams); | |
| 180 | |
| 181 if let Err(e) = self.do_poll(ctx) { | |
|
636
43eb3cfdf769
some progress, better error handling
Matt Johnston <matt@ucc.asn.au>
parents:
635
diff
changeset
|
182 self.limitlog.and_then(|| { |
|
43eb3cfdf769
some progress, better error handling
Matt Johnston <matt@ucc.asn.au>
parents:
635
diff
changeset
|
183 warn!("Problem fetching params: {}", e) |
|
43eb3cfdf769
some progress, better error handling
Matt Johnston <matt@ucc.asn.au>
parents:
635
diff
changeset
|
184 }); |
| 634 | 185 } |
| 186 } | |
| 187 | |
| 188 fn pre_start(&mut self, ctx: &Context<Self::Msg>) { | |
| 189 self.chan = Some(channel("params", &ctx.system).unwrap()); | |
| 190 ctx.schedule_once(Duration::from_secs(1), ctx.myself(), None, PollForParams); | |
| 592 | 191 } |
| 192 } | |
| 193 | |
| 633 | 194 // pub fn stream(config: Config, handle: Handle) -> Result<(), TemplogError> { |
| 195 // let rcself = Rc::new(ParamWaiter::new(config, handle)); | |
| 196 | |
| 197 // let dur = Duration::from_millis(4000); | |
| 198 // for _ in Interval::new(dur, &rcself.handle).unwrap() { | |
| 199 // // fetch params | |
| 200 // // TODO - skip if inflight. | |
| 201 // let r = await!(rcself.make_request()).map_err(|e| TemplogError::new_hyper("response", e))?; | |
| 202 // let status = r.status(); | |
| 203 // let b = await!(r.body().concat2()).map_err(|e| TemplogError::new_hyper("body", e))?; | |
| 204 // if let Ok(params) = rcself.handle_response(b, status) { | |
| 205 // stream_yield!(params); | |
| 206 // } | |
| 207 // } | |
| 208 // Ok(()) | |
| 209 // } | |
| 210 |