Mercurial > templog
annotate rust/src/main.rs @ 603:b45b8b4cf0f5 rust
get rid of lazy_static, config is passed around
better use of threadpool for sensors
readings are no longer options
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 16 Feb 2017 23:19:12 +0800 |
| parents | 8c21df3711e2 |
| children | 278f1002b5c7 |
| rev | line source |
|---|---|
|
588
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
1 extern crate tokio_core; |
|
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
2 extern crate futures; |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
3 #[macro_use] |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
4 extern crate log; |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
5 extern crate env_logger; |
| 597 | 6 extern crate rustc_serialize; |
| 7 extern crate time; | |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
8 |
| 595 | 9 #[macro_use] |
| 10 extern crate serde_derive; | |
| 11 extern crate serde; | |
| 12 | |
| 13 extern crate toml; | |
| 14 | |
| 597 | 15 extern crate docopt; |
| 16 | |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
17 use std::io; |
|
588
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
18 |
|
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
19 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
|
20 use futures::{Stream,Sink,Future}; |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
21 use futures::sync::{mpsc}; |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
22 use sensor::Sensor; |
|
589
f2508125adf1
Try using traits for periodic stream
Matt Johnston <matt@ucc.asn.au>
parents:
588
diff
changeset
|
23 |
| 595 | 24 mod config; |
| 590 | 25 mod sensor; |
| 597 | 26 pub mod fridge; |
|
592
03b48ec0bb03
fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
591
diff
changeset
|
27 mod types; |
|
593
bf138339d20a
fiddling with timeouts and closures
Matt Johnston <matt@ucc.asn.au>
parents:
592
diff
changeset
|
28 mod paramwaiter; |
| 591 | 29 |
|
592
03b48ec0bb03
fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
591
diff
changeset
|
30 use types::*; |
| 597 | 31 use config::Config; |
|
588
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
32 |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
33 fn run(config: &Config, nowait: bool, testmode: bool) { |
| 595 | 34 |
|
588
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
35 let mut core = Core::new().unwrap(); |
|
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
36 let handle = core.handle(); |
| 587 | 37 |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
38 let mut paramh = ParamHolder::new(); |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
39 let mut fridge = fridge::Fridge::new(&config, nowait, paramh.p, &handle); |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
40 |
| 597 | 41 let (fridge_reading_s, fridge_reading_r) = mpsc::channel(1); |
| 42 let fridge_reading_r = fridge_reading_r.map_err(|_| io::Error::new(io::ErrorKind::Other, "Problem with fridge_reading_r channel")); | |
| 587 | 43 |
| 597 | 44 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
|
45 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
|
46 } else { |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
47 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
|
48 }; |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
49 |
| 597 | 50 // 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
|
51 // while streaming them all to the web sender. |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
52 let s = sensor_stream.map(|r| { |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
53 debug!("sensors {:?}", r); |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
54 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
|
55 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
|
56 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
|
57 }; |
|
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
58 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
|
59 .map(|_| ()) |
| 595 | 60 .map_err(|e| { |
| 597 | 61 warn!("Send error in fridge_reading_s: {}", e.to_string()); |
| 595 | 62 () |
| 63 }); | |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
64 handle.spawn(t); |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
65 r |
|
588
038734052b20
fiddling with futures-rs instead
Matt Johnston <matt@ucc.asn.au>
parents:
587
diff
changeset
|
66 }); |
| 587 | 67 |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
68 let param_stream = paramwaiter::ParamWaiter::stream(&handle); |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
69 let p = param_stream.map(|p| { |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
70 fridge::Message::Params(p) |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
71 }); |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
72 |
| 597 | 73 let timeouts = fridge.wakeups(); |
| 591 | 74 |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
75 let all_readings = s.for_each(|_| Ok(())); |
| 597 | 76 let all_fridge = p.select(timeouts).select(fridge_reading_r).forward(fridge) |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
77 .map(|_| () ); |
|
592
03b48ec0bb03
fridge, types, configwaiter
Matt Johnston <matt@ucc.asn.au>
parents:
591
diff
changeset
|
78 |
|
594
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
79 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
|
80 |
|
aff50ee77252
rust working better now with streams and sinks.
Matt Johnston <matt@ucc.asn.au>
parents:
593
diff
changeset
|
81 core.run(all).ok(); |
| 587 | 82 } |
| 83 | |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
84 const USAGE: &'static str = "\ |
| 597 | 85 Wort Temperature |
| 86 Matt Johnston 2017 [email protected] | |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
87 Usage: wort-templog [--help] [--new] [--daemon] [--debug] [--test] [--defconf] [--thisconf] [--nowait] |
| 597 | 88 |
| 89 Options: | |
| 90 -h, --help | |
| 91 --new Replace existing running instance | |
| 92 -D, --daemon Run in background | |
| 93 -d, --debug | |
| 94 -t, --test Use fake sensors etc | |
| 95 --nowait Skip initial fridge wait | |
| 96 --defconf Print default config (customise in tempserver.conf) | |
| 97 --thisconf Print used config | |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
98 "; |
|
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
99 |
|
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
100 #[derive(RustcDecodable)] |
|
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
101 struct Args { |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
102 flag_new: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
103 flag_daemon: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
104 flag_debug: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
105 flag_test: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
106 flag_defconf: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
107 flag_thisconf: bool, |
|
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
108 flag_nowait: bool, |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
109 } |
| 597 | 110 |
| 111 fn setup_log(debug: bool) { | |
| 112 let loglevel = if debug { | |
| 113 log::LogLevelFilter::Debug | |
| 114 } else { | |
| 115 log::LogLevelFilter::Info | |
| 116 }; | |
| 117 | |
| 118 let format = |record: &log::LogRecord| { | |
| 119 let datefmt = "%Y-%m-%d %I:%M:%S %p"; | |
| 120 let ts = time::strftime(datefmt, &time::now()).unwrap(); | |
| 121 format!("{}: {} - {}", ts, record.level(), record.args()) | |
| 122 }; | |
| 123 | |
| 124 | |
| 125 let mut builder = env_logger::LogBuilder::new(); | |
| 126 builder.format(format).filter(Some("wort_templog"), loglevel); | |
| 127 builder.init().unwrap(); | |
| 128 } | |
| 129 | |
| 130 fn handle_args() -> Args { | |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
131 let args: Args = docopt::Docopt::new(USAGE).and_then(|d| d.decode()).unwrap_or_else(|e| e.exit()); |
| 597 | 132 |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
133 if args.flag_defconf { |
| 597 | 134 println!("Default configuration:\n{}\n\n{}", |
| 135 "(custom options go in tempserver.conf)", | |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
136 config::Config::default().to_toml_string()); |
| 597 | 137 std::process::exit(0); |
| 138 } | |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
139 args |
| 597 | 140 } |
| 141 | |
| 601 | 142 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
|
143 let nconfig = config::Config::default(); |
| 601 | 144 |
| 145 let conf_filename = "tempserver.conf"; | |
| 146 nconfig.merge_file(conf_filename) | |
| 147 .unwrap_or_else(|e| { | |
| 148 println!("Couldn't parse {}: {}", conf_filename, e); | |
| 149 std::process::exit(1); | |
| 150 }) | |
| 151 } | |
| 152 | |
| 597 | 153 fn main() { |
| 154 | |
| 155 let args = handle_args(); | |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
156 setup_log(args.flag_debug); |
| 597 | 157 //env_logger::init().unwrap(); |
| 158 | |
| 159 info!("wort-templog"); | |
| 160 debug!("debug mode"); | |
| 161 | |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
162 let config = load_config(); |
|
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
163 |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
164 if args.flag_thisconf { |
|
598
d4fbfb5c46ff
broken update of versions of things
Matt Johnston <matt@ucc.asn.au>
parents:
597
diff
changeset
|
165 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
|
166 config.to_toml_string()); |
|
599
f71cf1ad745f
updated toml serde works OK
Matt Johnston <matt@ucc.asn.au>
parents:
598
diff
changeset
|
167 std::process::exit(0); |
| 597 | 168 } |
| 169 | |
|
603
b45b8b4cf0f5
get rid of lazy_static, config is passed around
Matt Johnston <matt@ucc.asn.au>
parents:
601
diff
changeset
|
170 run(&config, args.flag_nowait, args.flag_test); |
| 597 | 171 } |
| 172 |