fix: upgrade deps and delete unused functions

This commit is contained in:
Medzik 2021-08-18 16:59:51 +00:00
parent 5d31d95915
commit aa06d6e32f
7 changed files with 11 additions and 50 deletions

View File

@ -3,6 +3,7 @@ package backend
import (
"time"
"github.com/MedzikUser/go-utils/common"
"gitlab.com/gaming0skar123/go/pingbot/database/mongo"
)
@ -12,7 +13,7 @@ func cache(retry int) {
cacheURL = cacheURL[:0]
results, err := mongo.GetAll()
if checkErr(err, "get documents from db") {
if common.CheckErr(err, "get documents from db") {
if retry == 5 {
time.Sleep(500 * time.Millisecond)
cache(retry + 1)

View File

@ -9,10 +9,7 @@ import (
"gitlab.com/gaming0skar123/go/pingbot/config"
)
var (
checkErr = common.CheckErr
cacheRetry int
)
var cacheRetry int
func ping() {
if cacheRetry >= config.Toml.Backend.Cache {
@ -32,7 +29,7 @@ func loop(url string) {
defer cancel()
req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
if checkErr(err, "new http request") {
if common.CheckErr(err, "new http request") {
Status.Error++
return
}

View File

@ -1,23 +0,0 @@
package mongo
import (
"context"
"fmt"
"time"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
)
func Delete(url string) (*mongo.DeleteResult, error) {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
r, err := Coll.DeleteOne(ctx, bson.M{"_id": url})
if err != nil {
fmt.Print(err)
return nil, err
}
return r, err
}

View File

@ -1,17 +0,0 @@
package mongo
import (
"context"
"time"
"go.mongodb.org/mongo-driver/mongo"
)
func Insert(url *URL) (*mongo.InsertOneResult, error) {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
result, err := Coll.InsertOne(ctx, url)
return result, err
}

4
go.mod
View File

@ -24,9 +24,9 @@ require (
go.mongodb.org/mongo-driver v1.7.1
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5 // indirect
golang.org/x/oauth2 v0.0.0-20210817223510-7df4dd6e12ab // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
golang.org/x/sys v0.0.0-20210818153620-00dd8d7831e7 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect

4
go.sum
View File

@ -362,6 +362,8 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5 h1:Ati8dO7+U7mxpkPSxBZQEvzHVUYB/MqCklCN8ig5w/o=
golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.0.0-20210817223510-7df4dd6e12ab h1:llrcWN/wOwO+6gAyfBzxb5hZ+c3mriU/0+KNgYu6adA=
golang.org/x/oauth2 v0.0.0-20210817223510-7df4dd6e12ab/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -413,6 +415,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo=
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210818153620-00dd8d7831e7 h1:/bmDWM82ZX7TawqxuI8kVjKI0TXHdSY6pHJArewwHtU=
golang.org/x/sys v0.0.0-20210818153620-00dd8d7831e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

View File

@ -10,11 +10,10 @@ import (
func GetAll(c *gin.Context) {
results, err := mongo.GetAll()
// Error Handling
if err != nil {
c.JSON(http.StatusInternalServerError, json{
"success": false,
"message": "Error fetching URLs!",
"message": "Error get URLs from Database!",
})
fmt.Println(err)