feature: Implemented zap logger

dogukanoksuz · dogukanoksuz · commit eba8c3da04d9 · 2022-09-05T18:14:00.000+03:00
diff --git a/app/handlers/extension.go b/app/handlers/extension.go
@@ -7,11 +7,12 @@ import (
 	"github.com/limanmys/render-engine/internal/sandbox"
 	"github.com/limanmys/render-engine/pkg/helpers"
 	"github.com/limanmys/render-engine/pkg/linux"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 func ExtensionRunner(c *fiber.Ctx) error {
 	if len(c.FormValue("extension_id")) < 1 {
-		return fiber.NewError(fiber.StatusNotFound, "extension not found")
+		return logger.FiberError(fiber.StatusNotFound, "extension not found")
 	}
 
 	extension, err := liman.GetExtension(&models.Extension{
@@ -23,7 +24,7 @@ func ExtensionRunner(c *fiber.Ctx) error {
 	}
 
 	if extension.Status == "0" {
-		return fiber.NewError(fiber.StatusServiceUnavailable, "extension is unavailable")
+		return logger.FiberError(fiber.StatusServiceUnavailable, "extension is unavailable")
 	}
 
 	credentials := &models.Credentials{}
@@ -38,7 +39,7 @@ func ExtensionRunner(c *fiber.Ctx) error {
 		)
 
 		if err != nil || len(credentials.Username) < 1 {
-			return fiber.NewError(fiber.StatusForbidden, "you need a key to use this extension")
+			return logger.FiberError(fiber.StatusForbidden, "you need a key to use this extension")
 		}
 	}
 
diff --git a/app/middleware/app_logger/new.go b/app/middleware/app_logger/new.go
@@ -1,4 +1,4 @@
-package appLogger
+package app_logger
 
 import (
 	"github.com/gofiber/fiber/v2"
diff --git a/app/middleware/auth/new.go b/app/middleware/auth/new.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/limanmys/render-engine/internal/liman"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 func New() fiber.Handler {
@@ -18,7 +19,7 @@ func authorization(c *fiber.Ctx) error {
 		)
 
 		if err != nil {
-			return fiber.NewError(fiber.StatusUnauthorized, err.Error())
+			return logger.FiberError(fiber.StatusUnauthorized, err.Error())
 		}
 
 		c.Locals("user_id", user)
@@ -31,7 +32,7 @@ func authorization(c *fiber.Ctx) error {
 		)
 
 		if err != nil {
-			return fiber.NewError(fiber.StatusUnauthorized, err.Error())
+			return logger.FiberError(fiber.StatusUnauthorized, err.Error())
 		}
 
 		c.Locals("user_id", user)
@@ -40,5 +41,5 @@ func authorization(c *fiber.Ctx) error {
 
 	// TODO: Log handlers
 
-	return fiber.NewError(fiber.StatusUnauthorized, "authorization token is missing")
+	return logger.FiberError(fiber.StatusUnauthorized, "authorization token is missing")
 }
diff --git a/app/middleware/permission/new.go b/app/middleware/permission/new.go
@@ -5,22 +5,23 @@ import (
 	"github.com/limanmys/render-engine/app/models"
 	"github.com/limanmys/render-engine/internal/liman"
 	"github.com/limanmys/render-engine/pkg/helpers"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 func New() fiber.Handler {
 	return permission
 }
 
 func permission(c *fiber.Ctx) error {
-	if helpers.Env("LIMAN_RESTRICTED", "false") == "true" {
-		return c.Next()
-	}
-
 	user, err := liman.GetUser(&models.User{
 		ID: c.Locals("user_id").(string),
 	})
 	if err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "error while getting the user")
+		return logger.FiberError(fiber.StatusInternalServerError, "error while getting the user")
+	}
+
+	if helpers.Env("LIMAN_RESTRICTED", "false") == "true" {
+		return c.Next()
 	}
 
 	if user.Status == 1 {
@@ -29,12 +30,12 @@ func permission(c *fiber.Ctx) error {
 
 	perms, err := liman.GetObjectPermissions(user)
 	if err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "error while getting the object permissions")
+		return logger.FiberError(fiber.StatusInternalServerError, "error while getting the object permissions")
 	}
 
 	if len(c.FormValue("server_id")) > 0 {
 		if !helpers.Contains(perms, c.FormValue("server_id")) {
-			return fiber.NewError(fiber.StatusForbidden, "you have no permission to do this")
+			return logger.FiberError(fiber.StatusForbidden, "you have no permission to do this")
 		}
 	}
 
@@ -50,7 +51,7 @@ func permission(c *fiber.Ctx) error {
 		}
 
 		if !helpers.Contains(perms, extensionID) || len(extensionID) < 1 {
-			return fiber.NewError(fiber.StatusForbidden, "you have no permission to do this")
+			return logger.FiberError(fiber.StatusForbidden, "you have no permission to do this")
 		}
 
 		c.Locals("extension_id", extensionID)
diff --git a/internal/liman/auth.go b/internal/liman/auth.go
@@ -4,6 +4,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/limanmys/render-engine/app/models"
 	"github.com/limanmys/render-engine/internal/database"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 func AuthWithToken(token string) (string, error) {
@@ -12,7 +13,7 @@ func AuthWithToken(token string) (string, error) {
 	err := database.Connection().First(&tokenObj, "token = ?", token).Error
 
 	if err != nil || len(tokenObj.UserID) < 1 {
-		return "", fiber.NewError(fiber.StatusUnauthorized, "authorization token is not valid")
+		return "", logger.FiberError(fiber.StatusUnauthorized, "authorization token is not valid")
 	}
 
 	return tokenObj.UserID, nil
@@ -24,7 +25,7 @@ func AuthWithAccessToken(token string) (string, error) {
 	err := database.Connection().First(&tokenObj, "token = ?", token).Error
 
 	if err != nil || len(tokenObj.UserID) < 1 {
-		return "", fiber.NewError(fiber.StatusUnauthorized, "authorization token is not valid")
+		return "", logger.FiberError(fiber.StatusUnauthorized, "authorization token is not valid")
 	}
 
 	return tokenObj.UserID, nil
diff --git a/internal/liman/credentials.go b/internal/liman/credentials.go
@@ -5,6 +5,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/limanmys/render-engine/app/models"
 	"github.com/limanmys/render-engine/internal/database"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 func GetCredentials(user *models.User, server *models.Server) (*models.Credentials, error) {
@@ -33,7 +34,7 @@ func GetCredentials(user *models.User, server *models.Server) (*models.Credentia
 	credentials.Type = serverKey.Type
 
 	if len(credentials.Username) < 1 {
-		return nil, fiber.NewError(fiber.StatusNotFound, "server not found")
+		return nil, logger.FiberError(fiber.StatusNotFound, "server not found")
 	}
 
 	return credentials, nil
diff --git a/internal/liman/extension.go b/internal/liman/extension.go
@@ -1,6 +1,7 @@
 package liman
 
 import (
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"strings"
@@ -10,20 +11,21 @@ import (
 	"github.com/limanmys/render-engine/app/models"
 	"github.com/limanmys/render-engine/internal/constants"
 	"github.com/limanmys/render-engine/internal/database"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 func GetExtension(extension *models.Extension) (*models.Extension, error) {
 	result := database.Connection().First(&extension)
 
 	if result.Error != nil {
-		return nil, fiber.NewError(fiber.StatusNotFound, "cannot found extension with this id")
+		return nil, logger.FiberError(fiber.StatusNotFound, "cannot found extension with this id")
 	}
 
 	if result.RowsAffected > 0 {
 		return extension, nil
 	}
 
-	return nil, fiber.NewError(fiber.StatusNotFound, "cannot found extension with this id")
+	return nil, logger.FiberError(fiber.StatusNotFound, "cannot found extension with this id")
 }
 
 func GetExtensionJSON(extension *models.Extension) (map[string]any, error) {
@@ -60,5 +62,5 @@ func GetLicence(extension *models.Extension) (*models.Licence, error) {
 		return licence, nil
 	}
 
-	return nil, fiber.NewError(fiber.StatusNotFound, "licence not found")
+	return nil, errors.New("Licence not found")
 }
diff --git a/internal/liman/role_system.go b/internal/liman/role_system.go
@@ -7,6 +7,7 @@ import (
 	"github.com/limanmys/render-engine/app/models"
 	"github.com/limanmys/render-engine/internal/database"
 	"github.com/limanmys/render-engine/pkg/helpers"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 func GetPermissions(user *models.User, extFilter string) ([]string, map[string]string, error) {
@@ -55,7 +56,7 @@ func getPermissionsFromMorph(morphID string, extFilter string) ([]string, map[st
 
 	err := database.Connection().Find(&permission, "morph_id = ?", morphID).Error
 	if err != nil {
-		return nil, nil, fiber.NewError(fiber.StatusInternalServerError, "error while fetching the permissions")
+		return nil, nil, logger.FiberError(fiber.StatusInternalServerError, "error while fetching the permissions")
 	}
 
 	funcPerms := []string{}
@@ -101,7 +102,7 @@ func getRoleMaps(user *models.User) ([]string, error) {
 
 	err := database.Connection().Find(&roles, "user_id = ?", user.ID).Error
 	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "error while fetching the roles")
+		return nil, logger.FiberError(fiber.StatusInternalServerError, "error while fetching the roles")
 	}
 
 	roleID := []string{user.ID}
diff --git a/internal/liman/server.go b/internal/liman/server.go
@@ -4,18 +4,19 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/limanmys/render-engine/app/models"
 	"github.com/limanmys/render-engine/internal/database"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 func GetServer(server *models.Server) (*models.Server, error) {
 	result := database.Connection().First(&server)
 
 	if result.Error != nil {
-		return nil, fiber.NewError(fiber.StatusNotFound, "cannot found server with this id")
+		return nil, logger.FiberError(fiber.StatusNotFound, "cannot found server with this id")
 	}
 
 	if result.RowsAffected > 0 {
 		return server, nil
 	}
 
-	return nil, fiber.NewError(fiber.StatusNotFound, "cannot found server with this id")
+	return nil, logger.FiberError(fiber.StatusNotFound, "cannot found server with this id")
 }
diff --git a/internal/liman/user.go b/internal/liman/user.go
@@ -4,18 +4,19 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/limanmys/render-engine/app/models"
 	"github.com/limanmys/render-engine/internal/database"
+	"github.com/limanmys/render-engine/pkg/logger"
 )
 
 func GetUser(user *models.User) (*models.User, error) {
 	result := database.Connection().First(&user)
 
 	if result.Error != nil {
-		return nil, fiber.NewError(fiber.StatusNotFound, "cannot found user with this id")
+		return nil, logger.FiberError(fiber.StatusNotFound, "cannot found user with this id")
 	}
 
 	if result.RowsAffected > 0 {
 		return user, nil
 	}
 
-	return nil, fiber.NewError(fiber.StatusNotFound, "cannot found user with this id")
+	return nil, logger.FiberError(fiber.StatusNotFound, "cannot found user with this id")
 }
diff --git a/internal/sandbox/command_generator.go b/internal/sandbox/command_generator.go
@@ -12,14 +12,15 @@ import (
 	"github.com/limanmys/render-engine/internal/constants"
 	"github.com/limanmys/render-engine/internal/liman"
 	"github.com/limanmys/render-engine/pkg/helpers"
+	"github.com/limanmys/render-engine/pkg/logger"
 	"github.com/mervick/aes-everywhere/go/aes256"
 )
 
 func GenerateCommand(extension *models.Extension, credentials *models.Credentials, params *models.CommandParams) (string, error) {
 	extension.Name = shellescape.StripUnsafe(extension.Name)
 
 	if !helpers.IsLetter(extension.Name) {
-		return "", fiber.NewError(fiber.StatusUnprocessableEntity, "extension names can only contains letters")
+		return "", logger.FiberError(fiber.StatusUnprocessableEntity, "extension names can only contains letters")
 	}
 
 	server, user, settings, err := getParams(extension, credentials, params)
@@ -74,7 +75,7 @@ func GenerateCommand(extension *models.Extension, credentials *models.Credential
 
 	secureKey, err := ioutil.ReadFile(constants.KEYS_PATH + "/" + extension.ID)
 	if err != nil {
-		return "", fiber.NewError(fiber.StatusNotFound, "cannot found extension key file")
+		return "", logger.FiberError(fiber.StatusNotFound, "cannot found extension key file")
 	}
 
 	extensionDataJson, _ := sonic.Marshal(extensionData)
diff --git a/main.go b/main.go
@@ -1,20 +1,32 @@
 package main
 
 import (
+	"log"
+	"strings"
+
 	"github.com/joho/godotenv"
+	"github.com/limanmys/render-engine/internal/bridge"
 	"github.com/limanmys/render-engine/internal/constants"
+	"github.com/limanmys/render-engine/pkg/linux"
 	"github.com/limanmys/render-engine/pkg/logger"
 	"github.com/limanmys/render-engine/pkg/utils"
 )
 
 func main() {
+	id := linux.Execute("id -u")
+	if strings.Trim(id, "\n") != "0" {
+		log.Fatalln("You need to run the service as root")
+	}
+
 	logger.InitLogger()
-	defer logger.Logger.Sync()
+	defer logger.Logger().Sync()
 
 	err := godotenv.Load(constants.CORE_PATH + "/.env")
 	if err != nil {
 		logger.Sugar().Fatalln("Cannot read Liman environment file")
 	}
 
+	go bridge.Clean()
+
 	utils.CreateServer()
 }
diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
@@ -3,31 +3,46 @@ package logger
 import (
 	"log"
 
+	"github.com/gofiber/fiber/v2"
 	"go.uber.org/zap"
 )
 
 var (
-	Logger *zap.Logger
+	logger *zap.Logger
 )
 
 func InitLogger() {
 	cfg := zap.NewProductionConfig()
+	cfg.DisableStacktrace = true
 	cfg.OutputPaths = []string{
 		"stdout",
-		"/liman/logs/fiber.log",
+		"/liman/logs/liman_new.log",
 	}
 
 	var err error
-	Logger, err = cfg.Build()
+	logger, err = cfg.Build()
 	if err != nil {
 		log.Fatalf("can't initialize zap logger: %v", err)
 	}
 }
 
+func Logger() *zap.Logger {
+	return logger
+}
+
 func Zap() *zap.Logger {
-	return Logger.WithOptions(zap.AddCallerSkip(1))
+	return logger.WithOptions(zap.AddCallerSkip(1))
 }
 
 func Sugar() *zap.SugaredLogger {
-	return Logger.Sugar().WithOptions(zap.AddCallerSkip(1))
+	return logger.Sugar().WithOptions(zap.AddCallerSkip(1))
+}
+
+func FiberError(code int, message string) *fiber.Error {
+	Sugar().Errorw(
+		message,
+		"error_code", code,
+	)
+
+	return fiber.NewError(code, message)
 }
diff --git a/pkg/utils/server.go b/pkg/utils/server.go

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,12 @@ import (`
`7`	`7`	`"github.com/limanmys/render-engine/internal/sandbox"`
`8`	`8`	`"github.com/limanmys/render-engine/pkg/helpers"`
`9`	`9`	`"github.com/limanmys/render-engine/pkg/linux"`
	`10`	`+ "github.com/limanmys/render-engine/pkg/logger"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`func ExtensionRunner(c *fiber.Ctx) error {`
`13`	`14`	`if len(c.FormValue("extension_id")) < 1 {`
`14`		`- return fiber.NewError(fiber.StatusNotFound, "extension not found")`
	`15`	`+ return logger.FiberError(fiber.StatusNotFound, "extension not found")`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`extension, err := liman.GetExtension(&models.Extension{`
`@@ -23,7 +24,7 @@ func ExtensionRunner(c *fiber.Ctx) error {`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`if extension.Status == "0" {`
`26`		`- return fiber.NewError(fiber.StatusServiceUnavailable, "extension is unavailable")`
	`27`	`+ return logger.FiberError(fiber.StatusServiceUnavailable, "extension is unavailable")`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`credentials := &models.Credentials{}`
`@@ -38,7 +39,7 @@ func ExtensionRunner(c *fiber.Ctx) error {`
`38`	`39`	`)`
`39`	`40`
`40`	`41`	`if err != nil \|\| len(credentials.Username) < 1 {`
`41`		`- return fiber.NewError(fiber.StatusForbidden, "you need a key to use this extension")`
	`42`	`+ return logger.FiberError(fiber.StatusForbidden, "you need a key to use this extension")`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package appLogger`
	`1`	`+package app_logger`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/gofiber/fiber/v2"`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/gofiber/fiber/v2"`
`7`	`7`	`"github.com/limanmys/render-engine/internal/liman"`
	`8`	`+ "github.com/limanmys/render-engine/pkg/logger"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`func New() fiber.Handler {`
`@@ -18,7 +19,7 @@ func authorization(c *fiber.Ctx) error {`
`18`	`19`	`)`
`19`	`20`
`20`	`21`	`if err != nil {`
`21`		`- return fiber.NewError(fiber.StatusUnauthorized, err.Error())`
	`22`	`+ return logger.FiberError(fiber.StatusUnauthorized, err.Error())`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`c.Locals("user_id", user)`
`@@ -31,7 +32,7 @@ func authorization(c *fiber.Ctx) error {`
`31`	`32`	`)`
`32`	`33`
`33`	`34`	`if err != nil {`
`34`		`- return fiber.NewError(fiber.StatusUnauthorized, err.Error())`
	`35`	`+ return logger.FiberError(fiber.StatusUnauthorized, err.Error())`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`c.Locals("user_id", user)`
`@@ -40,5 +41,5 @@ func authorization(c *fiber.Ctx) error {`
`40`	`41`
`41`	`42`	`// TODO: Log handlers`
`42`	`43`
`43`		`- return fiber.NewError(fiber.StatusUnauthorized, "authorization token is missing")`
	`44`	`+ return logger.FiberError(fiber.StatusUnauthorized, "authorization token is missing")`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,22 +5,23 @@ import (`
`5`	`5`	`"github.com/limanmys/render-engine/app/models"`
`6`	`6`	`"github.com/limanmys/render-engine/internal/liman"`
`7`	`7`	`"github.com/limanmys/render-engine/pkg/helpers"`
	`8`	`+ "github.com/limanmys/render-engine/pkg/logger"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`func New() fiber.Handler {`
`11`	`12`	`return permission`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`func permission(c *fiber.Ctx) error {`
`15`		`- if helpers.Env("LIMAN_RESTRICTED", "false") == "true" {`
`16`		`- return c.Next()`
`17`		`- }`
`18`		`-`
`19`	`16`	`user, err := liman.GetUser(&models.User{`
`20`	`17`	`ID: c.Locals("user_id").(string),`
`21`	`18`	`})`
`22`	`19`	`if err != nil {`
`23`		`- return fiber.NewError(fiber.StatusInternalServerError, "error while getting the user")`
	`20`	`+ return logger.FiberError(fiber.StatusInternalServerError, "error while getting the user")`
	`21`	`+ }`
	`22`	`+`
	`23`	`+ if helpers.Env("LIMAN_RESTRICTED", "false") == "true" {`
	`24`	`+ return c.Next()`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`if user.Status == 1 {`
`@@ -29,12 +30,12 @@ func permission(c *fiber.Ctx) error {`
`29`	`30`
`30`	`31`	`perms, err := liman.GetObjectPermissions(user)`
`31`	`32`	`if err != nil {`
`32`		`- return fiber.NewError(fiber.StatusInternalServerError, "error while getting the object permissions")`
	`33`	`+ return logger.FiberError(fiber.StatusInternalServerError, "error while getting the object permissions")`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`if len(c.FormValue("server_id")) > 0 {`
`36`	`37`	`if !helpers.Contains(perms, c.FormValue("server_id")) {`
`37`		`- return fiber.NewError(fiber.StatusForbidden, "you have no permission to do this")`
	`38`	`+ return logger.FiberError(fiber.StatusForbidden, "you have no permission to do this")`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
`@@ -50,7 +51,7 @@ func permission(c *fiber.Ctx) error {`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`if !helpers.Contains(perms, extensionID) \|\| len(extensionID) < 1 {`
`53`		`- return fiber.NewError(fiber.StatusForbidden, "you have no permission to do this")`
	`54`	`+ return logger.FiberError(fiber.StatusForbidden, "you have no permission to do this")`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`c.Locals("extension_id", extensionID)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"github.com/gofiber/fiber/v2"`
`5`	`5`	`"github.com/limanmys/render-engine/app/models"`
`6`	`6`	`"github.com/limanmys/render-engine/internal/database"`
	`7`	`+ "github.com/limanmys/render-engine/pkg/logger"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`func AuthWithToken(token string) (string, error) {`
`@@ -12,7 +13,7 @@ func AuthWithToken(token string) (string, error) {`
`12`	`13`	`err := database.Connection().First(&tokenObj, "token = ?", token).Error`
`13`	`14`
`14`	`15`	`if err != nil \|\| len(tokenObj.UserID) < 1 {`
`15`		`- return "", fiber.NewError(fiber.StatusUnauthorized, "authorization token is not valid")`
	`16`	`+ return "", logger.FiberError(fiber.StatusUnauthorized, "authorization token is not valid")`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`return tokenObj.UserID, nil`
`@@ -24,7 +25,7 @@ func AuthWithAccessToken(token string) (string, error) {`
`24`	`25`	`err := database.Connection().First(&tokenObj, "token = ?", token).Error`
`25`	`26`
`26`	`27`	`if err != nil \|\| len(tokenObj.UserID) < 1 {`
`27`		`- return "", fiber.NewError(fiber.StatusUnauthorized, "authorization token is not valid")`
	`28`	`+ return "", logger.FiberError(fiber.StatusUnauthorized, "authorization token is not valid")`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`return tokenObj.UserID, nil`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package liman`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "errors"`
`4`	`5`	`"fmt"`
`5`	`6`	`"io/ioutil"`
`6`	`7`	`"strings"`
`@@ -10,20 +11,21 @@ import (`
`10`	`11`	`"github.com/limanmys/render-engine/app/models"`
`11`	`12`	`"github.com/limanmys/render-engine/internal/constants"`
`12`	`13`	`"github.com/limanmys/render-engine/internal/database"`
	`14`	`+ "github.com/limanmys/render-engine/pkg/logger"`
`13`	`15`	`)`
`14`	`16`
`15`	`17`	`func GetExtension(extension models.Extension) (models.Extension, error) {`
`16`	`18`	`result := database.Connection().First(&extension)`
`17`	`19`
`18`	`20`	`if result.Error != nil {`
`19`		`- return nil, fiber.NewError(fiber.StatusNotFound, "cannot found extension with this id")`
	`21`	`+ return nil, logger.FiberError(fiber.StatusNotFound, "cannot found extension with this id")`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`if result.RowsAffected > 0 {`
`23`	`25`	`return extension, nil`
`24`	`26`	`}`
`25`	`27`
`26`		`- return nil, fiber.NewError(fiber.StatusNotFound, "cannot found extension with this id")`
	`28`	`+ return nil, logger.FiberError(fiber.StatusNotFound, "cannot found extension with this id")`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`func GetExtensionJSON(extension *models.Extension) (map[string]any, error) {`
`@@ -60,5 +62,5 @@ func GetLicence(extension models.Extension) (models.Licence, error) {`
`60`	`62`	`return licence, nil`
`61`	`63`	`}`
`62`	`64`
`63`		`- return nil, fiber.NewError(fiber.StatusNotFound, "licence not found")`
	`65`	`+ return nil, errors.New("Licence not found")`
`64`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"github.com/limanmys/render-engine/app/models"`
`8`	`8`	`"github.com/limanmys/render-engine/internal/database"`
`9`	`9`	`"github.com/limanmys/render-engine/pkg/helpers"`
	`10`	`+ "github.com/limanmys/render-engine/pkg/logger"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`func GetPermissions(user *models.User, extFilter string) ([]string, map[string]string, error) {`
`@@ -55,7 +56,7 @@ func getPermissionsFromMorph(morphID string, extFilter string) ([]string, map[st`
`55`	`56`
`56`	`57`	`err := database.Connection().Find(&permission, "morph_id = ?", morphID).Error`
`57`	`58`	`if err != nil {`
`58`		`- return nil, nil, fiber.NewError(fiber.StatusInternalServerError, "error while fetching the permissions")`
	`59`	`+ return nil, nil, logger.FiberError(fiber.StatusInternalServerError, "error while fetching the permissions")`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`funcPerms := []string{}`
`@@ -101,7 +102,7 @@ func getRoleMaps(user *models.User) ([]string, error) {`
`101`	`102`
`102`	`103`	`err := database.Connection().Find(&roles, "user_id = ?", user.ID).Error`
`103`	`104`	`if err != nil {`
`104`		`- return nil, fiber.NewError(fiber.StatusInternalServerError, "error while fetching the roles")`
	`105`	`+ return nil, logger.FiberError(fiber.StatusInternalServerError, "error while fetching the roles")`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`roleID := []string{user.ID}`
Original file line number	Diff line number	Diff line change
`@@ -4,18 +4,19 @@ import (`
`4`	`4`	`"github.com/gofiber/fiber/v2"`
`5`	`5`	`"github.com/limanmys/render-engine/app/models"`
`6`	`6`	`"github.com/limanmys/render-engine/internal/database"`
	`7`	`+ "github.com/limanmys/render-engine/pkg/logger"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`func GetServer(server models.Server) (models.Server, error) {`
`10`	`11`	`result := database.Connection().First(&server)`
`11`	`12`
`12`	`13`	`if result.Error != nil {`
`13`		`- return nil, fiber.NewError(fiber.StatusNotFound, "cannot found server with this id")`
	`14`	`+ return nil, logger.FiberError(fiber.StatusNotFound, "cannot found server with this id")`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`if result.RowsAffected > 0 {`
`17`	`18`	`return server, nil`
`18`	`19`	`}`
`19`	`20`
`20`		`- return nil, fiber.NewError(fiber.StatusNotFound, "cannot found server with this id")`
	`21`	`+ return nil, logger.FiberError(fiber.StatusNotFound, "cannot found server with this id")`
`21`	`22`	`}`