mirror of
https://github.com/mikedilger/gossip.git
synced 2024-09-19 19:46:50 +00:00
Fix a deadlock
This commit is contained in:
parent
d5aeaf1ba5
commit
5e0c38462d
@ -124,6 +124,7 @@ pub async fn add_event(event: &Event) -> Result<(), Error> {
|
|||||||
for tag in event.tags.iter() {
|
for tag in event.tags.iter() {
|
||||||
// Get some metadata from tags that could apply to multiple
|
// Get some metadata from tags that could apply to multiple
|
||||||
// kinds of events
|
// kinds of events
|
||||||
|
|
||||||
match tag {
|
match tag {
|
||||||
Tag::Event {
|
Tag::Event {
|
||||||
id,
|
id,
|
||||||
@ -168,7 +169,8 @@ pub async fn add_event(event: &Event) -> Result<(), Error> {
|
|||||||
}
|
}
|
||||||
} else if event.kind == EventKind::EventDeletion {
|
} else if event.kind == EventKind::EventDeletion {
|
||||||
// Find the other event
|
// Find the other event
|
||||||
if let Some(deleted_feed_event) = { GLOBALS.feed_events.lock().await.get(id) } {
|
let maybe_other_event = GLOBALS.feed_events.lock().await.get(id).cloned();
|
||||||
|
if let Some(deleted_feed_event) = maybe_other_event {
|
||||||
match &deleted_feed_event.event {
|
match &deleted_feed_event.event {
|
||||||
None => {
|
None => {
|
||||||
// Can't verify the author. Take no action
|
// Can't verify the author. Take no action
|
||||||
|
@ -230,6 +230,8 @@ impl Overlord {
|
|||||||
"new_event" => {
|
"new_event" => {
|
||||||
let event: Event = serde_json::from_str(&bus_message.json_payload)?;
|
let event: Event = serde_json::from_str(&bus_message.json_payload)?;
|
||||||
|
|
||||||
|
debug!("new event arrived: {}...", event.id.as_hex_string());
|
||||||
|
|
||||||
// If feed-related, send to the feed event processor
|
// If feed-related, send to the feed event processor
|
||||||
if event.kind == EventKind::TextNote
|
if event.kind == EventKind::TextNote
|
||||||
|| event.kind == EventKind::EncryptedDirectMessage
|
|| event.kind == EventKind::EncryptedDirectMessage
|
||||||
|
Loading…
Reference in New Issue
Block a user