From f240def745d14797b6a87ab4e0096821e8ec57da Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Wed, 9 Jan 2019 15:48:34 +0400 Subject: [PATCH] Try to terminal all goroutines at shutdown gracefully --- domains/announces/v1/announces.go | 88 ++++++++++++++++--------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/domains/announces/v1/announces.go b/domains/announces/v1/announces.go index 51645c2..0ed0674 100644 --- a/domains/announces/v1/announces.go +++ b/domains/announces/v1/announces.go @@ -24,54 +24,56 @@ func ZookeeperReceiver(client *tdlib.Client) { receiver := client.AddEventReceiver(&tdlib.UpdateNewMessage{}, fwMessagesFilter, 5) log.Debug().Msg("Receiver added") - for newMsg := range receiver.Chan { - updateMsg := (newMsg).(*tdlib.UpdateNewMessage) - // Check if message text contains needed battle data - msgText := updateMsg.Message.Content.(*tdlib.MessageText) - if strings.HasPrefix(msgText.Text.Text, "Я встретил") { - log.Debug().Msgf("%s", msgText.Text.Text) - battleType := "" - battleTag := "" - if strings.Contains(msgText.Text.Text, "Огров") { - battleType = "Огры!" - } - if strings.Contains(msgText.Text.Text, "Буйволов") { - battleType = "Буйволы!" - } - if strings.Contains(msgText.Text.Text, "Кабанов") { - battleType = "Кабаны!" - } - switch updateMsg.Message.ReplyMarkup.(type) { - case *tdlib.ReplyMarkupInlineKeyboard: - keyboard := updateMsg.Message.ReplyMarkup.(*tdlib.ReplyMarkupInlineKeyboard) - if len(keyboard.Rows) > 0 { - if len(keyboard.Rows[0]) > 0 { - button := keyboard.Rows[0][0] - switch button.Type.(type) { - case *tdlib.InlineKeyboardButtonTypeSwitchInline: - buttonQuery := button.Type.(*tdlib.InlineKeyboardButtonTypeSwitchInline) - battleTag = string(buttonQuery.Query) - default: - log.Error().Msg("Invalid button type") + go func() { + for newMsg := range receiver.Chan { + updateMsg := (newMsg).(*tdlib.UpdateNewMessage) + // Check if message text contains needed battle data + msgText := updateMsg.Message.Content.(*tdlib.MessageText) + if strings.HasPrefix(msgText.Text.Text, "Я встретил") { + log.Debug().Msgf("%s", msgText.Text.Text) + battleType := "" + battleTag := "" + if strings.Contains(msgText.Text.Text, "Огров") { + battleType = "Огры!" + } + if strings.Contains(msgText.Text.Text, "Буйволов") { + battleType = "Буйволы!" + } + if strings.Contains(msgText.Text.Text, "Кабанов") { + battleType = "Кабаны!" + } + switch updateMsg.Message.ReplyMarkup.(type) { + case *tdlib.ReplyMarkupInlineKeyboard: + keyboard := updateMsg.Message.ReplyMarkup.(*tdlib.ReplyMarkupInlineKeyboard) + if len(keyboard.Rows) > 0 { + if len(keyboard.Rows[0]) > 0 { + button := keyboard.Rows[0][0] + switch button.Type.(type) { + case *tdlib.InlineKeyboardButtonTypeSwitchInline: + buttonQuery := button.Type.(*tdlib.InlineKeyboardButtonTypeSwitchInline) + battleTag = string(buttonQuery.Query) + default: + log.Error().Msg("Invalid button type") + } } } + default: + log.Error().Msg("Invalid keyboard type") } - default: - log.Error().Msg("Invalid keyboard type") - } - log.Debug().Msgf("Battle type: %s", battleType) - log.Debug().Msgf("Battle tag: %s", battleTag) + log.Debug().Msgf("Battle type: %s", battleType) + log.Debug().Msgf("Battle tag: %s", battleTag) - replyText := battleType + " " + battleTag + replyText := battleType + " " + battleTag - reply := tdlib.NewInputMessageText(tdlib.NewFormattedText(replyText, nil), true, true) - _, err := client.SendMessage(announcerID, 0, false, true, nil, reply) - if err != nil { - log.Error().Err(err) + reply := tdlib.NewInputMessageText(tdlib.NewFormattedText(replyText, nil), true, true) + _, err := client.SendMessage(announcerID, 0, false, true, nil, reply) + if err != nil { + log.Error().Err(err) + } } + + <-c.ShutdownDone + return } - - <-c.ShutdownDone - return - } + }() }