Merge pull request 'fix' (#11) from master into dev

Reviewed-on: #11
This commit is contained in:
emmatveev 2025-01-06 13:16:39 +03:00
commit a564621d80

View File

@ -1,11 +1,8 @@
package routers package routers
import ( import (
"fmt"
"net/http" "net/http"
tasks "queues-go/app/storage/mongo/collections" tasks "queues-go/app/storage/mongo/collections"
"queues-go/app/storage/redis"
"time"
) )
type TaskResponse struct { type TaskResponse struct {
@ -20,17 +17,17 @@ type TakeResponse struct {
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 := redis.Sync.NewMutex(fmt.Sprintf("lock_queues_%s", queue)) // mutex := redis.Sync.NewMutex(fmt.Sprintf("lock_queues_%s", queue))
for { // for {
err := mutex.Lock() // err := mutex.Lock()
if err != nil { // if err != nil {
time.Sleep(time.Millisecond * 5) // time.Sleep(time.Millisecond * 5)
} else { // } else {
break // break
} // }
} // }
task, err := tasks.Take(queue) task, err := tasks.Take(queue)
mutex.Unlock() // mutex.Unlock()
if err != nil { if err != nil {
return nil, http.StatusInternalServerError return nil, http.StatusInternalServerError
} }