Merge pull request #97 from mbaraa/refactor/go-env-variable

Refactor: Add `GO_ENV` Environment Variable

.env.example

@@ -1,4 +1,5 @@
 PORT=3000
+GO_ENV="dev" # "beta" "prod"
 HOSTNAME="http://localhost:3000"
 JWT_SECRET="spoikoninochi"
 

app/Makefile

@@ -17,18 +17,15 @@ init:
 	go generate && \
     go run main.go migrate
 
-seed:
-	go run main.go seed
-
 dev:
 	go run github.com/cosmtrek/[email protected]
 
 beta:
-	./${BINARY_NAME} serve
+	GO_ENV="beta" ./${BINARY_NAME} serve
 
 prod:
 	./${BINARY_NAME} migrate
-	./${BINARY_NAME} serve
+	GO_ENV="prod" ./${BINARY_NAME} serve
 
 clean:
 	go clean

app/cmd/server/server.go

@@ -7,6 +7,7 @@ import (
 	"dankmuzikk/handlers/middlewares/auth"
 	"dankmuzikk/handlers/middlewares/contenttype"
 	"dankmuzikk/handlers/middlewares/ismobile"
+	"dankmuzikk/handlers/middlewares/logger"
 	"dankmuzikk/handlers/middlewares/theme"
 	"dankmuzikk/handlers/pages"
 	"dankmuzikk/log"
@@ -125,5 +126,8 @@ func StartServer(staticFS embed.FS) error {
 	applicationHandler.Handle("/api/", ismobile.Handler(theme.Handler(http.StripPrefix("/api", apisHandler))))
 
 	log.Info("Starting http server at port " + config.Env().Port)
+	if config.Env().GoEnv == "dev" || config.Env().GoEnv == "beta" {
+		return http.ListenAndServe(":"+config.Env().Port, logger.Handler(ismobile.Handler(theme.Handler(m.Middleware(applicationHandler)))))
+	}
 	return http.ListenAndServe(":"+config.Env().Port, ismobile.Handler(theme.Handler(m.Middleware(applicationHandler))))
 }

app/config/env.go

@@ -12,6 +12,7 @@ var (
 func initEnvVars() {
 	_config = config{
 		Port:      getEnv("PORT"),
+		GoEnv:     getEnv("GO_ENV"),
 		Hostname:  getEnv("HOSTNAME"),
 		JwtSecret: getEnv("JWT_SECRET"),
 		YouTube: struct {
@@ -57,6 +58,7 @@ func initEnvVars() {
 
 type config struct {
 	Port      string
+	GoEnv     string
 	Hostname  string
 	JwtSecret string
 	YouTube   struct {

app/handlers/middlewares/logger/logger.go

@@ -0,0 +1,18 @@
+package logger
+
+import (
+	"dankmuzikk/log"
+	"fmt"
+	"net/http"
+)
+
+func Handler(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		log.Infoln(r.Method, r.URL.Path, r.URL.Query())
+		for key, val := range r.Header {
+			log.Infoln(key, val)
+		}
+		fmt.Println()
+		h.ServeHTTP(w, r)
+	})
+}

docker-compose-beta.yml

@@ -4,7 +4,7 @@ services:
   app-beta:
     container_name: "dankmuzikk-beta"
     build:
-      dockerfile: ./Dockerfile.beta
+      dockerfile: ./Dockerfile
       context: ./app
     image: "dankmuzikk-app-beta"
     restart: "always"