WIP

commit: 64d20d6a3de6617c099639b451e2fd0f83260821
author: bnema · 3y ago · 2023-09-04 21:57 UTC
committer: bnema · 3y ago · 2023-09-04 19:31 UTC
parent: 20bb2e2
signature: unsigned

5 files · +13 -12

M cmd/main.go +5 -5


@@ -20,21 +20,21 @@ func main() {
20	20		gordon, err := app.NewApp()
21	21		if err != nil {
22	22		// Handle initialization error and exit
23		-	gordon.APPLogger.Error().Err(err).Msg("Failed to initialize app")
	23	+	gordon.AppLogger.Error().Err(err).Msg("Failed to initialize app")
24	24		return
25	25		}
26		-	utils.CaptureSTDOUT(gordon.APPLogger)
	26	+	utils.CaptureSTDOUT(gordon.AppLogger)
27	27
28	28		e := echo.New()
29	29		e.HideBanner = true
30	30		e.HidePort = true
31		-	e.Logger = utils.NewEchoLoggerWrapper(gordon.APPLogger)
	31	+	e.Logger = utils.NewEchoLoggerWrapper(gordon.AppLogger)
32	32		e = routes.ConfigureRouter(e, gordon)
33	33
34	34		startFunc := func() error {
35		-	gordon.APPLogger.Info().Msgf("Server is listening on port %s", port)
	35	+	gordon.AppLogger.Info().Msgf("Server is listening on port %s", port)
36	36		return e.Start(":" + port)
37	37		}
38		-	utils.RunAppCatchSIGINT(startFunc, &gordon.APPLogger.Logger)
	38	+	utils.RunAppCatchSIGINT(startFunc, &gordon.AppLogger.Logger)
39	39
40	40		}


@@ -20,21 +20,21 @@ func main() {
20		gordon, err := app.NewApp()	20		gordon, err := app.NewApp()
21		if err != nil {	21		if err != nil {
22		// Handle initialization error and exit	22		// Handle initialization error and exit
23	-	gordon.APPLogger.Error().Err(err).Msg("Failed to initialize app")	23	+	gordon.AppLogger.Error().Err(err).Msg("Failed to initialize app")
24		return	24		return
25		}	25		}
26	-	utils.CaptureSTDOUT(gordon.APPLogger)	26	+	utils.CaptureSTDOUT(gordon.AppLogger)
27			27
28		e := echo.New()	28		e := echo.New()
29		e.HideBanner = true	29		e.HideBanner = true
30		e.HidePort = true	30		e.HidePort = true
31	-	e.Logger = utils.NewEchoLoggerWrapper(gordon.APPLogger)	31	+	e.Logger = utils.NewEchoLoggerWrapper(gordon.AppLogger)
32		e = routes.ConfigureRouter(e, gordon)	32		e = routes.ConfigureRouter(e, gordon)
33			33
34		startFunc := func() error {	34		startFunc := func() error {
35	-	gordon.APPLogger.Info().Msgf("Server is listening on port %s", port)	35	+	gordon.AppLogger.Info().Msgf("Server is listening on port %s", port)
36		return e.Start(":" + port)	36		return e.Start(":" + port)
37		}	37		}
38	-	utils.RunAppCatchSIGINT(startFunc, &gordon.APPLogger.Logger)	38	+	utils.RunAppCatchSIGINT(startFunc, &gordon.AppLogger.Logger)
39			39
40		}	40		}

M internal/app/app.go +6 -6


@@ -22,8 +22,8 @@ const (
22	22		)
23	23
24	24		type App struct {
25		-	APPLogger *utils.Logger
26		-	HTTPLogger *utils.Logger
	25	+	AppLogger *utils.Logger
	26	+	HttpLogger *utils.Logger
27	27		Template *template.Template
28	28		}
29	29		type Config struct {

@@ -34,7 +34,7 @@ type Config struct {
34	34		func loadConfig() Config {
35	35		// Get the environment variable
36	36		env := os.Getenv(EnvVarName)
37		-	// If the environment variable is empty, set it to "dev" (/tmp)
	37	+	// If the environment variable is empty, considere it is dev -> (/tmp)
38	38		buildDir := os.Getenv(BuildDirEnvVarName)
39	39		if buildDir == "" {
40	40		buildDir = DefaultBuildDir

@@ -65,9 +65,9 @@ func NewApp() (*App, error) {
65	65		app := &App{}
66	66
67	67		// Initialize the general application logger
68		-	app.APPLogger = utils.NewLogger().SetOutput(initializeLoggerOutput("app.log"))
	68	+	app.AppLogger = utils.NewLogger().SetOutput(initializeLoggerOutput("app.log"))
69	69		// Initialize the HTTP logger
70		-	app.HTTPLogger = utils.NewLogger().SetOutput(initializeLoggerOutput("http.log"))
	70	+	app.HttpLogger = utils.NewLogger().SetOutput(initializeLoggerOutput("http.log"))
71	71
72	72		return app, nil
73	73		}

@@ -91,7 +91,7 @@ func initializeLoggerOutput(logFile string) io.Writer {
91	91		}
92	92
93	93		func SetupLogging() {
94		-	err := utils.CreateLogsDir(cfg.LogDir) // Assuming you adjust CreateLogsDir to take a directory path.
	94	+	err := utils.CreateLogsDir(cfg.LogDir)
95	95		if err != nil {
96	96		panic(err)
97	97		}


@@ -22,8 +22,8 @@ const (
22		)	22		)
23			23
24		type App struct {	24		type App struct {
25	-	APPLogger *utils.Logger	25	+	AppLogger *utils.Logger
26	-	HTTPLogger *utils.Logger	26	+	HttpLogger *utils.Logger
27		Template *template.Template	27		Template *template.Template
28		}	28		}
29		type Config struct {	29		type Config struct {

@@ -34,7 +34,7 @@ type Config struct {
34		func loadConfig() Config {	34		func loadConfig() Config {
35		// Get the environment variable	35		// Get the environment variable
36		env := os.Getenv(EnvVarName)	36		env := os.Getenv(EnvVarName)
37	-	// If the environment variable is empty, set it to "dev" (/tmp)	37	+	// If the environment variable is empty, considere it is dev -> (/tmp)
38		buildDir := os.Getenv(BuildDirEnvVarName)	38		buildDir := os.Getenv(BuildDirEnvVarName)
39		if buildDir == "" {	39		if buildDir == "" {
40		buildDir = DefaultBuildDir	40		buildDir = DefaultBuildDir

@@ -65,9 +65,9 @@ func NewApp() (*App, error) {
65		app := &App{}	65		app := &App{}
66			66
67		// Initialize the general application logger	67		// Initialize the general application logger
68	-	app.APPLogger = utils.NewLogger().SetOutput(initializeLoggerOutput("app.log"))	68	+	app.AppLogger = utils.NewLogger().SetOutput(initializeLoggerOutput("app.log"))
69		// Initialize the HTTP logger	69		// Initialize the HTTP logger
70	-	app.HTTPLogger = utils.NewLogger().SetOutput(initializeLoggerOutput("http.log"))	70	+	app.HttpLogger = utils.NewLogger().SetOutput(initializeLoggerOutput("http.log"))
71			71
72		return app, nil	72		return app, nil
73		}	73		}

@@ -91,7 +91,7 @@ func initializeLoggerOutput(logFile string) io.Writer {
91		}	91		}
92			92
93		func SetupLogging() {	93		func SetupLogging() {
94	-	err := utils.CreateLogsDir(cfg.LogDir) // Assuming you adjust CreateLogsDir to take a directory path.	94	+	err := utils.CreateLogsDir(cfg.LogDir)
95		if err != nil {	95		if err != nil {
96		panic(err)	96		panic(err)
97		}	97		}

M internal/http/routes/router.go +1 -1


@@ -11,7 +11,7 @@ func ConfigureRouter(e echo.Echo, app app.App) *echo.Echo {
11	11		// The logger is already set in main.go, so we don't need to set it again here.
12	12
13	13		// Register middlewares
14		-	e.Use(middlewares.NewRequestLogger(app.HTTPLogger.Logger))
	14	+	e.Use(middlewares.NewRequestLogger(app.HttpLogger.Logger))
15	15		e.Use(middlewares.LanguageDetection)
16	16		e.Use(middlewares.ColorSchemeDetection)
17	17		//e.Use(middlewares.SecureMiddleware()) // Uncomment this line to enable the secure middleware


@@ -11,7 +11,7 @@ func ConfigureRouter(e echo.Echo, app app.App) *echo.Echo {
11		// The logger is already set in main.go, so we don't need to set it again here.	11		// The logger is already set in main.go, so we don't need to set it again here.
12			12
13		// Register middlewares	13		// Register middlewares
14	-	e.Use(middlewares.NewRequestLogger(app.HTTPLogger.Logger))	14	+	e.Use(middlewares.NewRequestLogger(app.HttpLogger.Logger))
15		e.Use(middlewares.LanguageDetection)	15		e.Use(middlewares.LanguageDetection)
16		e.Use(middlewares.ColorSchemeDetection)	16		e.Use(middlewares.ColorSchemeDetection)
17		//e.Use(middlewares.SecureMiddleware()) // Uncomment this line to enable the secure middleware	17		//e.Use(middlewares.SecureMiddleware()) // Uncomment this line to enable the secure middleware

A pkg/scripts/install-traefik.go +1 -0

@@ -0,0 +1,1 @@
	1	+	package scripts

@@ -0,0 +1,1 @@
			1	+	package scripts

R pkg/utils/services/sqlite.go → pkg/services/sqlite.go +0 -0 renamed, 100% similar

renamed, 100% similar