Skip to content
This repository has been archived by the owner on Sep 13, 2023. It is now read-only.

patch: blocking telegram calls #17

Merged
merged 2 commits into from
Feb 11, 2023
Merged

patch: blocking telegram calls #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45c5e0d
move body close to asyncPost
freitzzz Feb 11, 2023
a2b4687
remove result chan
freitzzz Feb 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions pkg/telegramwriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ type TelegramWriter struct {
chatId string
}

var resultChan = make(chan *http.Response)

func (tw TelegramWriter) Write(p []byte) (n int, err error) {

body, err := json.Marshal(map[string]string{
Expand All @@ -27,25 +25,20 @@ func (tw TelegramWriter) Write(p []byte) (n int, err error) {

url := fmt.Sprintf("https://api.telegram.org/bot%s/sendMessage", tw.botToken)

go asyncPost(url, body, resultChan)

response := <-resultChan
defer func() {
if response != nil && response.Body != nil {
response.Body.Close()
}
}()
go asyncPost(url, body)

return len(p), nil
}

func asyncPost(url string, body []byte, rc chan *http.Response) {
func asyncPost(url string, body []byte) {
response, err := http.Post(url, messageType, bytes.NewBuffer(body))

if err != nil {
rc <- response
return
}

rc <- response
if response.Body != nil {
response.Body.Close()
}

}