1 files changed, 14 insertions, 21 deletions
diff --git a/cmd/web/main.go b/cmd/web/main.go
index cda5300..e260b42 100644
--- a/cmd/web/main.go
+++ b/cmd/web/main.go
@@ -10,42 +10,35 @@ import (
 	"github.com/joho/godotenv"
 
 	"paterissa.net/mblog/cmd/web/handlers"
-	"paterissa.net/mblog/internal/context"
+	"paterissa.net/mblog/cmd/web/types"
 )
 
-type application struct {
-	err		*log.Logger
-	info	*log.Logger
-
-	env		context.Environment
-}
-
 func main() {
-	var app application
+	var app types.Application
 
-	app.err = log.New(os.Stderr, "ERROR\t", log.Ldate | log.Ltime)
-	app.info = log.New(os.Stdout, "INFO\t", log.Ldate | log.Ltime)
+	app.Err = log.New(os.Stderr, "ERROR\t", log.Ldate | log.Ltime)
+	app.Info = log.New(os.Stdout, "INFO\t", log.Ldate | log.Ltime)
 
 	err := godotenv.Load()
 	if err != nil {
-		app.err.Fatal("Failed to load env")
+		app.Err.Fatal("Failed to load env")
 	}
 	
-	app.env.Webmaster = os.Getenv("webmaster")
-	app.env.Db.Username = os.Getenv("db_user")
-	app.env.Db.Password = os.Getenv("db_pass")
-	app.env.AppPort, err = strconv.ParseUint(os.Getenv("app_port"), 10, 64)
+	app.Env.Webmaster = os.Getenv("webmaster")
+	app.Env.Db.Username = os.Getenv("db_user")
+	app.Env.Db.Password = os.Getenv("db_pass")
+	app.Env.AppPort, err = strconv.ParseUint(os.Getenv("web_port"), 10, 64)
 	if err != nil {
-		app.env.AppPort = 5005
+		app.Env.AppPort = 5005
 	}
 
-	router := handlers.RegisterEndpoints(app.env.Webmaster)
+	router := handlers.RegisterEndpoints(app)
 	srv := &http.Server{
-		Addr: fmt.Sprintf(":%d", app.env.AppPort),
-		ErrorLog: app.err,
+		Addr: fmt.Sprintf(":%d", app.Env.AppPort),
+		ErrorLog: app.Err,
 		Handler: router,
 	}
 
 	err = srv.ListenAndServe()
-	app.err.Fatal(err)
+	app.Err.Fatal(err)
 }