Sky/Moonshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert 5f893647c7

Browse Source 
revert logger and config updates
This commit is contained in:
Sky Johnson 2025-03-15 20:56:34 -05:00
parent 424b778f28
commit 52e34d4fdc
2 changed files with 21 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/logger/logger.go
View File

@ -27,7 +27,6 @@ const (
LevelWarning
LevelError
LevelFatal
LevelServer
)
// Level names and colors
@ -40,7 +39,6 @@ var levelProps = map[int]struct {
LevelWarning: {"WARN", colorYellow},
LevelError: {" ERR", colorRed},
LevelFatal: {"FATL", colorPurple},
LevelServer: {"SRVR", colorGreen},
}
// Time format for log messages
@ -229,11 +227,6 @@ func (l *Logger) Fatal(format string, args ...any) {
// No need for os.Exit here as it's handled in log()
}
// Server logs a server message
func (l *Logger) Server(format string, args ...any) {
l.log(LevelServer, format, args...)
}
// Default global logger
var defaultLogger = New(LevelInfo, true)
@ -262,11 +255,6 @@ func Fatal(format string, args ...any) {
defaultLogger.Fatal(format, args...)
}
// Server logs a server message to the default logger
func Server(format string, args ...any) {
defaultLogger.Server(format, args...)
}
// LogRaw logs a raw message to the default logger
func LogRaw(format string, args ...any) {
defaultLogger.LogRaw(format, args...)

29
moonshark.go
View File

@ -47,9 +47,9 @@ func initRouters(routesDir, staticDir string, log *logger.Logger) (*routers.LuaR
func main() {
// Initialize logger
log := logger.New(logger.LevelDebug, true)
log := logger.New(logger.LevelInfo, true)
log.Server("Starting Moonshark server")
log.Info("Starting Moonshark server")
// Load configuration from config.lua
cfg, err := config.Load("config.lua")
@ -59,19 +59,6 @@ func main() {
cfg = config.New()
}
switch cfg.GetString("log_level", "info") {
case "debug":
log.SetLevel(logger.LevelDebug)
case "warn":
log.SetLevel(logger.LevelWarning)
case "error":
log.SetLevel(logger.LevelError)
case "fatal":
log.SetLevel(logger.LevelFatal)
default:
log.SetLevel(logger.LevelInfo)
}
// Get port from config or use default
port := cfg.GetInt("port", 3117)
@ -83,7 +70,6 @@ func main() {
log.Fatal("Router initialization failed: %v", err)
}
if cfg.GetBool("watchers", false) {
// Set up file watchers for automatic reloading
luaWatcher, err := watchers.WatchLuaRouter(luaRouter, routesDir, log)
if err != nil {
@ -100,17 +86,16 @@ func main() {
defer staticWatcher.Close()
log.Info("File watcher active for static files")
}
}
// Get worker pool size from config or use default
workerPoolSize := cfg.GetInt("pool_size", 4)
workerPoolSize := cfg.GetInt("worker_pool_size", 4)
// Initialize worker pool
pool, err := workers.NewPool(workerPoolSize)
if err != nil {
log.Fatal("Failed to initialize worker pool: %v", err)
}
log.Server("Worker pool initialized with %d workers", workerPoolSize)
log.Info("Worker pool initialized with %d workers", workerPoolSize)
defer pool.Shutdown()
// Create HTTP server
@ -129,11 +114,11 @@ func main() {
}
}()
log.Server("Server started on port %d", port)
log.Info("Server started on port %d", port)
// Wait for interrupt signal
<-stop
log.Server("Shutdown signal received")
log.Info("Shutdown signal received")
// Gracefully shut down the server
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@ -143,5 +128,5 @@ func main() {
log.Error("Server shutdown error: %v", err)
}
log.Server("Server stopped")
log.Info("Server stopped")
}