move subscription retrying into connect_and_subscribe_sensor(); simplify #11
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33f7016 to
f50b6b5
Compare
publish-mqtt/src/main.rs
Outdated
|
|
||
| let mut backoff = ExponentialBackoff::default(); | ||
| backoff.max_elapsed_time = | ||
| Some(SENSOR_CONNECT_RESERVATION_TIMEOUT - 2 * DBUS_METHOD_CALL_TIMEOUT); |
Collaborator
There was a problem hiding this comment.
I'd rather this just be a constant which is enough small enough than SENSOR_CONNECT_RESERVATION_TIMEOUT, rather than making DBUS_METHOD_CALL_TIMEOUT public.
publish-mqtt/src/main.rs
Outdated
| Some(SENSOR_CONNECT_RESERVATION_TIMEOUT - 2 * DBUS_METHOD_CALL_TIMEOUT); | ||
|
|
||
| (|| session.start_notify_sensor(id).map_err(Into::into)) | ||
| .retry(backoff) |
Collaborator
There was a problem hiding this comment.
Use UFCS for this retry call, as it is confusing for the trait to be added to the closure.
| impl SensorStore for Vec<Sensor> { | ||
| fn get_by_id(&self, id: &DeviceId) -> Option<&Sensor> { | ||
| self.iter().find(|s| &s.id == id) | ||
| } |
Collaborator
There was a problem hiding this comment.
Nit: Blank line between methods?
mijia/src/lib.rs
Outdated
| /// 500 in little-endian | ||
| const CONNECTION_INTERVAL_500_MS: [u8; 3] = [0xF4, 0x01, 0x00]; | ||
| const DBUS_METHOD_CALL_TIMEOUT: Duration = Duration::from_secs(30); | ||
| pub const DBUS_METHOD_CALL_TIMEOUT: Duration = Duration::from_secs(30); |
Collaborator
There was a problem hiding this comment.
I'd prefer this not be public.
| sensor.name, sensor.connection_status, e | ||
| ); | ||
| } | ||
| let SensorState { sensors, homie, .. } = state.deref_mut(); |
Collaborator
There was a problem hiding this comment.
This destructuring thing isn't actually needed, you can just use the `let state = &mut *state.lock().await;" trick that we use elsewhere.
adding extension traits to closures is a bit non-obvious.
fb14632 to
1a45d5a
Compare
qwandor-google
approved these changes
Sep 29, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows us to delete the SubscribingFailedOnce state, because it is folded into Connecting.
There are also some meanderings about using id rather than idx to identify sensors. Once we stop caring about the ConnectionStatus while connecting. Mijia only cares about the id, so if we can also only care about the id then we are only holding a single piece of state across the connection attempt, which feels quite elegant.