Mercurial > templog

annotate rust/src/types.rs @ 624:2710649ab71e rust

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
read/write params local file. untested
author Matt Johnston <matt@ucc.asn.au>
date Sun, 16 Apr 2017 23:29:27 +0800
parents 03167105f6de
children efcbe0d3afd6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
594
aff50ee77252 rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents: 593
diff changeset
1 use std::collections::HashMap;
609
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
2 use std::time::{Duration,Instant};
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
3 use std::error::Error;
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
4 use std::fmt;
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
5 use std::io;
610
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
6 use std::cmp;
609
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
7 use std::cell::Cell;
610
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
8 use std::iter::FromIterator;
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
9 use std;
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
10
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
11 use futures::{Stream,IntoFuture};
595
e87655ed8429 add config
Matt Johnston <matt@ucc.asn.au>
parents: 594
diff changeset
12 use serde::{Deserialize,Serialize};
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
13 use toml;
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
14 use curl;
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
15 use serde_json;
594
aff50ee77252 rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents: 593
diff changeset
16
592
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
17 #[derive(Debug)]
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
18 pub struct Readings {
603
b45b8b4cf0f5 get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents: 596
diff changeset
19 pub temps: HashMap<String, f32>,
592
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
20 }
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
22 impl Readings {
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23 pub fn new() -> Readings {
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
24 Readings {
594
aff50ee77252 rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents: 593
diff changeset
25 temps: HashMap::new(),
592
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
26 }
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
27 }
593
bf138339d20a fiddling with timeouts and closures
Matt Johnston <matt@ucc.asn.au>
parents: 592
diff changeset
28
603
b45b8b4cf0f5 get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents: 596
diff changeset
29 pub fn add(&mut self, name: &str, v: f32) {
b45b8b4cf0f5 get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents: 596
diff changeset
30 self.temps.insert(name.to_string(), v);
593
bf138339d20a fiddling with timeouts and closures
Matt Johnston <matt@ucc.asn.au>
parents: 592
diff changeset
31 }
bf138339d20a fiddling with timeouts and closures
Matt Johnston <matt@ucc.asn.au>
parents: 592
diff changeset
32
603
b45b8b4cf0f5 get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents: 596
diff changeset
33 pub fn get_temp(&self, name: &str) -> Option<f32> {
b45b8b4cf0f5 get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents: 596
diff changeset
34 self.temps.get(name).map(|f| *f)
592
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
35 }
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
36 }
03b48ec0bb03 fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
37
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
38 #[derive(Debug)]
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
39 pub enum TemplogErrorKind {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
40 None,
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
41 Io(io::Error),
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
42 ParseFloat(std::num::ParseFloatError),
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
43 TomlDe(toml::de::Error),
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
44 SerdeJson(serde_json::Error),
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
45 Curl(curl::Error),
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
46 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
47
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
48 #[derive(Debug)]
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
49 pub struct TemplogError {
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
50 msg: String,
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
51 desc: String,
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
52 kind: TemplogErrorKind,
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
53 }
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
54
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
55 impl Error for TemplogError {
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
56 fn description(&self) -> &str {
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
57 &self.desc
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
58 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
59
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
60 fn cause(&self) -> Option<&Error> {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
61 match self.kind {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
62 TemplogErrorKind::None => None,
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
63 TemplogErrorKind::Io(ref e) => Some(e),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
64 TemplogErrorKind::ParseFloat(ref e) => Some(e),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
65 TemplogErrorKind::TomlDe(ref e) => Some(e),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
66 TemplogErrorKind::SerdeJson(ref e) => Some(e),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
67 TemplogErrorKind::Curl(ref e) => Some(e),
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
68 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
69 }
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
70
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
71 }
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
72
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
73 impl fmt::Display for TemplogError {
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
74 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
75 write!(f, "{}", self.kind_str());
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
76 if !self.msg.is_empty() {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
77 write!(f, ": {}", self.msg);
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
78 }
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
79 match self.kind {
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
80 TemplogErrorKind::None => Ok(()),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
81 TemplogErrorKind::Io(ref e) => write!(f, ": {}", e),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
82 TemplogErrorKind::TomlDe(ref e) => write!(f, ": {}", e),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
83 TemplogErrorKind::SerdeJson(ref e) => write!(f, ": {}", e),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
84 TemplogErrorKind::ParseFloat(ref e) => write!(f, ": {}", e),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
85 TemplogErrorKind::Curl(ref e) => write!(f, ": {}", e),
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
86 };
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
87 Ok(())
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
88 }
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
89 }
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
90
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
91 impl TemplogError {
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
92 pub fn new(msg: &str) -> Self {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
93 TemplogError::new_kind(msg, TemplogErrorKind::None)
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
94 }
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
95
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
96 pub fn new_io(msg: &str, e: io::Error) -> Self {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
97 TemplogError::new_kind(msg, TemplogErrorKind::Io(e))
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
98 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
99
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
100 pub fn new_toml_de(msg: &str, e: toml::de::Error) -> Self {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
101 TemplogError::new_kind(msg, TemplogErrorKind::TomlDe(e))
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
102 }
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
103
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
104 pub fn new_parse_float(msg: &str, e: std::num::ParseFloatError) -> Self {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
105 TemplogError::new_kind(msg, TemplogErrorKind::ParseFloat(e))
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
106 }
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
107
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
108 pub fn new_curl(msg: &str, e: curl::Error) -> Self {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
109 TemplogError::new_kind(msg, TemplogErrorKind::Curl(e))
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
110 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
111
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
112 pub fn new_serde_json(msg: &str, e: serde_json::Error) -> Self {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
113 TemplogError::new_kind(msg, TemplogErrorKind::SerdeJson(e))
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
114 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
115
623
03167105f6de ignore missing local.conf
Matt Johnston <matt@ucc.asn.au>
parents: 621
diff changeset
116 pub fn kind(&self) -> &TemplogErrorKind {
03167105f6de ignore missing local.conf
Matt Johnston <matt@ucc.asn.au>
parents: 621
diff changeset
117 return &self.kind;
03167105f6de ignore missing local.conf
Matt Johnston <matt@ucc.asn.au>
parents: 621
diff changeset
118 }
03167105f6de ignore missing local.conf
Matt Johnston <matt@ucc.asn.au>
parents: 621
diff changeset
119
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
120 fn new_kind(msg: &str, k: TemplogErrorKind) -> Self {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
121 let mut s = TemplogError {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
122 msg: msg.to_string(),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
123 desc: String::new(),
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
124 kind: k,
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
125 };
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
126 s.desc = if s.msg.is_empty() {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
127 s.kind_str().to_string()
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
128 } else {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
129 format!("{}: {}", s.kind_str(), s.msg)
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
130 };
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
131 s
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
132 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
133
612
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
134 fn kind_str(&self) -> &str {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
135 match self.kind {
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
136 TemplogErrorKind::None => "Templog Error",
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
137 TemplogErrorKind::Io(_) => "Templog IO error",
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
138 TemplogErrorKind::TomlDe(_) => "Templog toml error",
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
139 TemplogErrorKind::SerdeJson(_) => "Templog Json decode error",
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
140 TemplogErrorKind::ParseFloat(_) => "Templog parse error",
5fc41e0833b4 fix TemplogError references
Matt Johnston <matt@ucc.asn.au>
parents: 611
diff changeset
141 TemplogErrorKind::Curl(_) => "Templog curl http error",
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
142 }
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
143 }
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
144 }
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
145
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
146 impl From<io::Error> for TemplogError {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
147 fn from(e: io::Error) -> Self {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
148 TemplogError::new_io("", e)
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
149 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
150 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
151
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
152 impl From<toml::de::Error> for TemplogError {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
153 fn from(e: toml::de::Error) -> Self {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
154 TemplogError::new_toml_de("", e)
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
155 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
156 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
157
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
158 impl From<std::num::ParseFloatError> for TemplogError {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
159 fn from(e: std::num::ParseFloatError) -> Self {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
160 TemplogError::new_parse_float("", e)
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
161 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
162 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
163
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
164 impl From<curl::Error> for TemplogError {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
165 fn from(e: curl::Error) -> Self {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
166 TemplogError::new_curl("", e)
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
167 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
168 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
169
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
170 impl From<serde_json::Error> for TemplogError {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
171 fn from(e: serde_json::Error) -> Self {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
172 TemplogError::new_serde_json("", e)
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
173 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
174 }
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
175
609
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
176 /// Call closures with a rate limit. Useful for log message ratelimiting
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
177 #[derive(Clone)]
609
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
178 pub struct NotTooOften {
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
179 last: Cell<Instant>,
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
180 limit: Duration,
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
181 }
604
278f1002b5c7 sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents: 603
diff changeset
182
609
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
183 impl NotTooOften {
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
184 pub fn new(limit_secs: u64) -> Self {
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
185 NotTooOften {
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
186 limit: Duration::new(limit_secs, 0),
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
187 last: Cell::new(Instant::now() - Duration::new(limit_secs+1, 0)),
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
188 }
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
189 }
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
190
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
191 pub fn and_then<F>(&self, op: F)
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
192 where F: Fn() {
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
193 let now = Instant::now();
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
194 if now - self.last.get() > self.limit {
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
195 self.last.set(now);
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
196 op();
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
197 }
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
198 }
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
199 }
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
200
610
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
201 struct Period {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
202 start: Instant,
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
203 end: Option<Instant>,
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
204 }
609
7bda01659426 not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents: 604
diff changeset
205
610
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
206 pub struct StepIntegrator {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
207 on_periods: Vec<Period>,
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
208 limit: Duration,
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
209 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
210
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
211 impl StepIntegrator {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
212 pub fn new(limit: Duration) -> Self {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
213 StepIntegrator {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
214 on_periods: Vec::new(),
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
215 limit: limit,
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
216 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
217 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
218
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
219 pub fn turn(&mut self, on: bool) {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
220 self.trim();
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
221
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
222 if self.on_periods.is_empty() {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
223 self.on_periods.push( Period { start: Instant::now(), end: None });
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
224 return;
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
225 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
226
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
227 let current_on = self.on_periods.last().unwrap().end.is_none();
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
228 if on == current_on {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
229 // state is unchanged
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
230 return;
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
231 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
232
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
233 if on {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
234 self.on_periods.push( Period { start: Instant::now(), end: None });
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
235 } else {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
236 self.on_periods.last_mut().unwrap().end = Some(Instant::now());
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
237 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
238 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
239
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
240 pub fn set_limit(&mut self, limit: Duration) {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
241 self.limit = limit;
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
242 self.trim();
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
243 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
244
621
8136a6b99866 make it compile again
Matt Johnston <matt@ucc.asn.au>
parents: 617
diff changeset
245 pub fn integrate(&self) -> Duration {
610
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
246 let durs = self.on_periods.iter().map(|p| {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
247 let end = p.end.unwrap_or_else(|| Instant::now());
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
248 end - p.start
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
249 });
617
87a78343140e Duration::sum works now
Matt Johnston <matt@ucc.asn.au>
parents: 615
diff changeset
250 durs.sum()
610
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
251 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
252
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
253 fn trim(&mut self) {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
254 let begin = Instant::now() - self.limit;
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
255
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
256 self.on_periods.retain(|p| {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
257 // remove expired endtimes
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
258 if let Some(e) = p.end {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
259 e >= begin && e != p.start
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
260 } else {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
261 true
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
262 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
263 });
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
264
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
265 for p in &mut self.on_periods {
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
266 p.start = cmp::max(p.start, begin);
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
267 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
268 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
269 }
af0dac00d40b untested step integrator
Matt Johnston <matt@ucc.asn.au>
parents: 609
diff changeset
270
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
271 /// Takes a stream and returns a stream without errors.
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
272 pub fn consume_errors<S>(s: S) -> Box<Stream<Item=S::Item, Error=S::Error>>
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
273 where
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
274 S: Stream+Send+'static,
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
275 <S as Stream>::Error: std::fmt::Display+Send+'static,
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
276 <S as Stream>::Item: Send+'static,
617
87a78343140e Duration::sum works now
Matt Johnston <matt@ucc.asn.au>
parents: 615
diff changeset
277 {
87a78343140e Duration::sum works now
Matt Johnston <matt@ucc.asn.au>
parents: 615
diff changeset
278 let f = s.then(|r| {
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
279 match r {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
280 Ok(v) => Ok(Some(v)),
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
281 Err(e) => {
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
282 debug!("Stream error: {}", e);
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
283 Ok(None)
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
284 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
285 }
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
286 })
617
87a78343140e Duration::sum works now
Matt Johnston <matt@ucc.asn.au>
parents: 615
diff changeset
287 .filter_map(|p| p);
87a78343140e Duration::sum works now
Matt Johnston <matt@ucc.asn.au>
parents: 615
diff changeset
288 Box::new(f)
611
f3e39e2107fd still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents: 610
diff changeset
289 }