From 960e97e9f9f7e187fd691e7b8915fbbb741eccc5 Mon Sep 17 00:00:00 2001
From: perp <perp@tcp.direct>
Date: Thu, 6 Jun 2024 19:16:09 +0100
Subject: [PATCH] Changed comments, renamed variables, change addr from config

---
 cmd/main.go | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/cmd/main.go b/cmd/main.go
index ee11864..970a1a3 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -1,21 +1,8 @@
-// Copyright 2024 perp (supernets)
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 package main
 
 import (
 	_ "embed"
+	"fmt"
 	"net/http"
 	"time"
 
@@ -34,7 +21,7 @@ var content []byte
 const version = "0.0.0"
 
 func main() {
-	// Parse config
+	// Parse config & setup logger
 	cfg := config.Parse(content)
 	config.SetupLogger(cfg.Log)
 
@@ -45,20 +32,20 @@ func main() {
 	db := database.New(cfg.Database)
 
 	// Create context
-	ctx := context.New(cfg, db)
+	ctx := context.New(db, cfg)
 
 	// Create router
-	r := router.New(ctx)
+	rtr := router.New(ctx)
 
 	// Create server
 	server := &http.Server{
-		Handler:      r,
-		Addr:         cfg.Server.Address,
+		Handler:      rtr,
+		Addr:         fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port),
 		ReadTimeout:  time.Second * time.Duration(cfg.Server.ReadTimeout),
 		WriteTimeout: time.Second * time.Duration(cfg.Server.WriteTimeout),
 	}
 
-	// Start server
+	// Run server
 	err := server.ListenAndServe()
 	if err != nil {
 		log.Panic().Msg(err.Error())