diff --git a/src/rustylee/src/brain.rs b/src/rustylee/src/brain.rs index 63b9b5d..648b39b 100644 --- a/src/rustylee/src/brain.rs +++ b/src/rustylee/src/brain.rs @@ -52,7 +52,7 @@ impl Brain { } while let Ok(message) = self.organ_rx.try_recv() { - self.process_organ_message(message); + self.process_message_from_organ(message); } self.rest(); @@ -153,8 +153,8 @@ impl Brain { self.state != Buried } - fn process_organ_message(&mut self, message: BrainMessage) { - debug!("organ message received: {:?}", message); + fn process_message_from_organ(&mut self, message: BrainMessage) { + debug!("organ message received: {:?}.", message); if let OrganCommand::Waken = message.organ_command.command { self.state = LifeState::Awake; } diff --git a/src/rustylee/src/organs/heart.rs b/src/rustylee/src/organs/heart.rs index 8f5699d..7ddcb7d 100644 --- a/src/rustylee/src/organs/heart.rs +++ b/src/rustylee/src/organs/heart.rs @@ -76,6 +76,7 @@ impl Heart { let reply = BrainMessage { organ_command: command_envelope, responded_at: Time::time_stamp_millis(), + organ_id: self.id, response, }; diff --git a/src/rustylee/src/protocols.rs b/src/rustylee/src/protocols.rs index 86b8e89..02e72a1 100644 --- a/src/rustylee/src/protocols.rs +++ b/src/rustylee/src/protocols.rs @@ -33,5 +33,6 @@ pub struct OrganCommandEnvelope { pub struct BrainMessage { pub organ_command: OrganCommandEnvelope, pub responded_at: u64, + pub organ_id: u32, pub response: OrganResponse, } \ No newline at end of file