Added logger singleton

This commit is contained in:
stratic-dev
2024-10-11 00:15:11 +01:00
parent 32dbfa7514
commit 44692e986e
12 changed files with 165 additions and 74 deletions

View File

@@ -3,6 +3,7 @@ package signserver
import (
"database/sql"
"encoding/hex"
"erupe-ce/utils/logger"
"erupe-ce/utils/stringsupport"
"fmt"
"net"
@@ -28,7 +29,7 @@ const (
// Session holds state for the sign server connection.
type Session struct {
sync.Mutex
logger *zap.Logger
logger logger.Logger
server *Server
rawConn net.Conn
cryptConn *network.CryptConn

View File

@@ -8,6 +8,7 @@ import (
_config "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/utils/logger"
"github.com/jmoiron/sqlx"
"go.uber.org/zap"
@@ -15,7 +16,6 @@ import (
// Config struct allows configuring the server.
type Config struct {
Logger *zap.Logger
DB *sqlx.DB
ErupeConfig *_config.Config
}
@@ -23,7 +23,7 @@ type Config struct {
// Server is a MHF sign server.
type Server struct {
sync.Mutex
logger *zap.Logger
logger logger.Logger
erupeConfig *_config.Config
sessions map[int]*Session
db *sqlx.DB
@@ -34,7 +34,7 @@ type Server struct {
// NewServer creates a new Server type.
func NewServer(config *Config) *Server {
s := &Server{
logger: config.Logger,
logger: logger.Get().Named("sign"),
erupeConfig: config.ErupeConfig,
db: config.DB,
}