Merge pull request 'master' (#35) from master into prod

Reviewed-on: https://gitea.chocomarsh.com/self/queues-go/pulls/35
This commit is contained in:
emmatveev 2025-06-15 23:07:32 +03:00
commit 1512dd4575

View File

@ -1,9 +1,15 @@
package routers package routers
import ( import (
"bytes"
"fmt"
"log"
"net/http" "net/http"
"os"
tasks "queues-go/app/storage/mongo/collections" tasks "queues-go/app/storage/mongo/collections"
"strconv"
"sync" "sync"
"time"
) )
type TaskResponse struct { type TaskResponse struct {
@ -18,6 +24,24 @@ type TakeResponse struct {
var MutexMap map[string]*sync.Mutex var MutexMap map[string]*sync.Mutex
func sendLatency(timestamp time.Time, latency int) error {
loc, _ := time.LoadLocation("Europe/Moscow")
s := fmt.Sprintf(
`{"timestamp":"%s","service":"queues","environment":"%s","name":"latency","count":%s}`,
timestamp.In(loc).Format("2006-01-02T15:04:05Z"),
os.Getenv("STAGE"),
strconv.Itoa(latency),
)
data := []byte(s)
r := bytes.NewReader(data)
_, err := http.Post("http://monitoring:1237/api/v1/metrics/increment", "application/json", r)
if err != nil {
log.Printf("ERROR %s", err.Error())
}
return err
}
func Take(r *http.Request) (interface{}, int) { func Take(r *http.Request) (interface{}, int) {
queue := r.Header.Get("queue") queue := r.Header.Get("queue")
mutex, ok := MutexMap[queue] mutex, ok := MutexMap[queue]
@ -41,6 +65,8 @@ func Take(r *http.Request) (interface{}, int) {
Attempt: task.Attempts, Attempt: task.Attempts,
Payload: task.Payload, Payload: task.Payload,
} }
now := time.Now()
go sendLatency(now, int(now.Sub(task.PutAt).Milliseconds()))
} }
return response, http.StatusOK return response, http.StatusOK