refactor(app): moved all db and log to one intialize spot
This commit is contained in:
@@ -5,14 +5,14 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"lst.net/internal/db"
|
||||
"gorm.io/gorm"
|
||||
"lst.net/internal/models"
|
||||
"lst.net/pkg/logger"
|
||||
)
|
||||
|
||||
func getServers(c *gin.Context) {
|
||||
log := logger.New()
|
||||
servers, err := GetServers()
|
||||
func getServers(c *gin.Context, log *logger.CustomLogger, db *gorm.DB) {
|
||||
|
||||
servers, err := GetServers(log, db)
|
||||
log.Info("Current Settings", "system", map[string]interface{}{
|
||||
"endpoint": "/api/v1/settings",
|
||||
"client_ip": c.ClientIP(),
|
||||
@@ -20,7 +20,7 @@ func getServers(c *gin.Context) {
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
log := logger.New()
|
||||
|
||||
log.Error("Current Settings", "system", map[string]interface{}{
|
||||
"endpoint": "/api/v1/settings",
|
||||
"client_ip": c.ClientIP(),
|
||||
@@ -34,9 +34,9 @@ func getServers(c *gin.Context) {
|
||||
c.JSON(200, gin.H{"message": "Current settings", "data": servers})
|
||||
}
|
||||
|
||||
func GetServers() ([]map[string]interface{}, error) {
|
||||
func GetServers(log *logger.CustomLogger, db *gorm.DB) ([]map[string]interface{}, error) {
|
||||
var servers []models.Servers
|
||||
res := db.DB.Find(&servers)
|
||||
res := db.Find(&servers)
|
||||
|
||||
if res.Error != nil {
|
||||
return nil, res.Error
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
package servers
|
||||
|
||||
import (
|
||||
"log"
|
||||
|
||||
"lst.net/internal/db"
|
||||
"gorm.io/gorm"
|
||||
"lst.net/internal/models"
|
||||
"lst.net/pkg/logger"
|
||||
)
|
||||
|
||||
func NewServer(serverData models.Servers) (string, error) {
|
||||
func NewServer(serverData models.Servers, log *logger.CustomLogger, db *gorm.DB) (string, error) {
|
||||
|
||||
err := db.DB.Create(&serverData).Error
|
||||
err := db.Create(&serverData).Error
|
||||
|
||||
if err != nil {
|
||||
log.Println("There was an error adding the new server")
|
||||
log.Error("There was an error adding the new server", "server", map[string]interface{}{
|
||||
"error": err,
|
||||
})
|
||||
return "There was an error adding the new server", err
|
||||
}
|
||||
|
||||
|
||||
@@ -2,10 +2,12 @@ package servers
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"gorm.io/gorm"
|
||||
"lst.net/pkg/logger"
|
||||
)
|
||||
|
||||
func RegisterServersRoutes(l *gin.Engine, baseUrl string) {
|
||||
func RegisterServersRoutes(l *gin.Engine, baseUrl string, log *logger.CustomLogger, db *gorm.DB) {
|
||||
|
||||
s := l.Group(baseUrl + "/api/v1")
|
||||
s.GET("/servers", getServers)
|
||||
s.GET("/servers", func(c *gin.Context) { getServers(c, log, db) })
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user