Mercurial > templog
annotate rust/src/main.rs @ 631:c57821a60e51 rust
rust work in progress ?
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sat, 06 Jul 2019 18:28:34 +0800 |
| parents | d5075136442f |
| children | bde302def78e |
| rev | line source |
|---|---|
| 627 | 1 #![feature(proc_macro, conservative_impl_trait, generators)] |
| 631 | 2 #![feature(await_macro, async_await, futures_api)] |
| 627 | 3 |
| 4 | |
| 631 | 5 #[macro_use] |
| 6 extern crate tokio; | |
| 7 #[macro_use] | |
| 8 extern crate futures; | |
| 9 | |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
10 #[macro_use] |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
11 extern crate log; |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
12 extern crate env_logger; |
| 597 | 13 extern crate rustc_serialize; |
| 14 extern crate time; | |
|
611
f3e39e2107fd
still doesn't compile, improvements to TemplogError and tokio curl though
Matt Johnston <matt@ucc.asn.au>
parents:
609
diff
changeset
|
15 extern crate serde_json; |
| 623 | 16 extern crate libc; |
|
624
2710649ab71e
read/write params local file. untested
Matt Johnston <matt@ucc.asn.au>
parents:
623
diff
changeset
|
17 extern crate atomicwrites; |
| 626 | 18 extern crate hyper; |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
19 |
|
604
278f1002b5c7
sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents:
603
diff
changeset
|
20 #[macro_use] |
|
278f1002b5c7
sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents:
603
diff
changeset
|
21 extern crate lazy_static; |
|
278f1002b5c7
sensor regex, custom error type
Matt Johnston <matt@ucc.asn.au>
parents:
603
diff
changeset
|
22 |
| 595 | 23 #[macro_use] |
| 24 extern crate serde_derive; | |
| 25 extern crate serde; | |
| 26 | |
| 27 extern crate toml; | |
| 28 | |
| 597 | 29 extern crate docopt; |
| 30 | |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
31 use std::io; |
|
588
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
32 |
| 631 | 33 use tokio_core::reactor:: Core; |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
34 use futures::{Stream,Sink,Future}; |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
35 use futures::sync::{mpsc}; |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
36 use sensor::Sensor; |
|
589
f2508125adf1
Try using traits for periodic stream
Matt Johnston <matt@ucc.asn.au>
parents:
588
diff
changeset
|
37 |
| 595 | 38 mod config; |
| 590 | 39 mod sensor; |
|
609
7bda01659426
not building, paramwaiter work
Matt Johnston <matt@ucc.asn.au>
parents:
607
diff
changeset
|
40 mod fridge; |
|
592
03b48ec0bb03
fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
591
diff
changeset
|
41 mod types; |
| 615 | 42 mod params; |
| 591 | 43 |
|
592
03b48ec0bb03
fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
591
diff
changeset
|
44 use types::*; |
| 597 | 45 use config::Config; |
|
588
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
46 |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
47 fn run(config: &Config, nowait: bool, testmode: bool) { |
| 595 | 48 |
|
588
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
49 let mut core = Core::new().unwrap(); |
|
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
50 let handle = core.handle(); |
| 587 | 51 |
| 615 | 52 let params = params::Params::load(&config); |
| 53 let mut fridge = fridge::Fridge::new(&config, nowait, params, &handle); | |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
54 |
| 597 | 55 let sensor_stream = if testmode { |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
56 sensor::TestSensor::new(config).stream(&handle) |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
57 } else { |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
58 sensor::OneWireSensor::new(config).stream(&handle) |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
59 }; |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
60 |
| 597 | 61 // Send the sensors of interest to the fridge (fridge_reading_s), |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
62 // while streaming them all to the web sender. |
| 620 | 63 let (fridge_reading_s, fridge_reading_r) = mpsc::channel(1); |
| 64 let fridge_reading_r = fridge_reading_r.map_err(|e| TemplogError::new("Problem with fridge_reading_r channel")); | |
| 65 let sensor_stream = sensor_stream.map(|r| { | |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
66 debug!("sensors {:?}", r); |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
67 let msg = fridge::Message::Sensor { |
|
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
68 wort: r.get_temp(&config.WORT_NAME), |
|
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
69 fridge: r.get_temp(&config.FRIDGE_NAME) |
|
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
70 }; |
|
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
71 let t = fridge_reading_s.clone().send(msg) |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
72 .map(|_| ()) |
| 595 | 73 .map_err(|e| { |
| 597 | 74 warn!("Send error in fridge_reading_s: {}", e.to_string()); |
| 595 | 75 () |
| 76 }); | |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
77 handle.spawn(t); |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
78 r |
|
588
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
79 }); |
| 587 | 80 |
| 627 | 81 let param_stream = params::ParamWaiter::stream(config.clone(), handle.clone()); |
| 620 | 82 let param_stream = param_stream.map(|p| { |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
83 fridge::Message::Params(p) |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
84 }); |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
85 |
| 597 | 86 let timeouts = fridge.wakeups(); |
| 591 | 87 |
| 620 | 88 // forward all the different types of messages to the fridge |
| 89 let all_fridge = param_stream.select(timeouts).select(fridge_reading_r).forward(fridge) .map(|_| () ); | |
|
592
03b48ec0bb03
fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
591
diff
changeset
|
90 |
| 620 | 91 let all_readings = sensor_stream.for_each(|_| Ok(())); |
| 92 | |
| 93 // run forever | |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
94 let all = all_fridge.select(all_readings); |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
95 core.run(all).ok(); |
| 587 | 96 } |
| 97 | |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
98 const USAGE: &'static str = "\ |
| 597 | 99 Wort Temperature |
| 100 Matt Johnston 2017 [email protected] | |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
101 Usage: wort-templog [--help] [--new] [--daemon] [--debug] [--test] [--defconf] [--thisconf] [--nowait] |
| 597 | 102 |
| 103 Options: | |
| 104 -h, --help | |
| 105 --new Replace existing running instance | |
| 106 -D, --daemon Run in background | |
| 107 -d, --debug | |
| 108 -t, --test Use fake sensors etc | |
| 109 --nowait Skip initial fridge wait | |
| 615 | 110 --defconf Print default config (customise in local.conf) |
| 597 | 111 --thisconf Print used config |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
112 "; |
|
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
113 |
|
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
114 #[derive(RustcDecodable)] |
|
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
115 struct Args { |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
116 flag_new: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
117 flag_daemon: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
118 flag_debug: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
119 flag_test: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
120 flag_defconf: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
121 flag_thisconf: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
122 flag_nowait: bool, |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
123 } |
| 597 | 124 |
| 125 fn setup_log(debug: bool) { | |
| 126 let loglevel = if debug { | |
| 127 log::LogLevelFilter::Debug | |
| 128 } else { | |
| 129 log::LogLevelFilter::Info | |
| 130 }; | |
| 131 | |
| 132 let format = |record: &log::LogRecord| { | |
| 133 let datefmt = "%Y-%m-%d %I:%M:%S %p"; | |
| 134 let ts = time::strftime(datefmt, &time::now()).unwrap(); | |
| 135 format!("{}: {} - {}", ts, record.level(), record.args()) | |
| 136 }; | |
| 137 | |
| 138 | |
| 139 let mut builder = env_logger::LogBuilder::new(); | |
| 140 builder.format(format).filter(Some("wort_templog"), loglevel); | |
| 141 builder.init().unwrap(); | |
| 142 } | |
| 143 | |
| 144 fn handle_args() -> Args { | |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
145 let args: Args = docopt::Docopt::new(USAGE).and_then(|d| d.decode()).unwrap_or_else(|e| e.exit()); |
| 597 | 146 |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
147 if args.flag_defconf { |
| 597 | 148 println!("Default configuration:\n{}\n\n{}", |
| 615 | 149 "(custom options go in local.conf)", |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
150 config::Config::default().to_toml_string()); |
| 597 | 151 std::process::exit(0); |
| 152 } | |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
153 args |
| 597 | 154 } |
| 155 | |
| 601 | 156 fn load_config() -> Config { |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
157 let nconfig = config::Config::default(); |
| 601 | 158 |
| 615 | 159 let conf_filename = "local.conf"; |
| 601 | 160 nconfig.merge_file(conf_filename) |
| 161 .unwrap_or_else(|e| { | |
| 623 | 162 if let TemplogErrorKind::Io(ref ioe) = *e.kind() { |
| 163 if let Some(errno) = ioe.raw_os_error() { | |
| 164 if errno == libc::ENOENT { | |
| 165 return nconfig; | |
| 166 } | |
| 167 } | |
| 168 } | |
| 169 | |
| 601 | 170 println!("Couldn't parse {}: {}", conf_filename, e); |
| 171 std::process::exit(1); | |
| 172 }) | |
| 173 } | |
| 174 | |
| 597 | 175 fn main() { |
| 176 | |
| 177 let args = handle_args(); | |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
178 setup_log(args.flag_debug); |
| 597 | 179 //env_logger::init().unwrap(); |
| 180 | |
| 181 info!("wort-templog"); | |
| 182 debug!("debug mode"); | |
| 183 | |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
184 let config = load_config(); |
|
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
185 |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
186 if args.flag_thisconf { |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
187 println!("Current configuration:\n\n{}", |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
188 config.to_toml_string()); |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
189 std::process::exit(0); |
| 597 | 190 } |
| 191 | |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
192 run(&config, args.flag_nowait, args.flag_test); |
| 597 | 193 } |