gromer

gromer is a framework and cli to build multipage web apps in golang using htmx and alpinejs.

7ed98962 — Peter John

fix loging

Files changed (3) hide show

cmd/gromer/main.go CHANGED Viewed

@@ -238,22 +238,22 @@ import (
 var assetsFS embed.FS
 func main() {
-	isLambda := os.Getenv("_LAMBDA_SERVER_PORT") != ""
+	port := os.Getenv("PORT")
 	r := mux.NewRouter()
 	r.NotFoundHandler = http.HandlerFunc(notFound)
 	r.PathPrefix("/assets/").Handler(wrapCache(http.FileServer(http.FS(assetsFS))))
 	handle(r, "GET", "/api", gromer.ApiExplorer(apiDefinitions()))
 	{{#each routes as |route| }}handle(r, "{{ route.Method }}", "{{ route.Path }}", {{ route.Pkg }}.{{ route.Method }})
 	{{/each}}
-	if !isLambda {
+	if !gromer.IsLambda {
-		println("http server listening on http://localhost:3000")
+		println("http server listening on http://localhost:"+port)
 		srv := server.New(r, nil)
-		if err := srv.ListenAndServe(":3000"); err != nil {
+		if err := srv.ListenAndServe(":"+port); err != nil {
 			log.Fatal().Stack().Err(err).Msg("failed to listen")
 		}
 	} else {
 		log.Print("running in lambda mode")
-		if err := gateway.ListenAndServe(":3000", r); err != nil {
+		if err := gateway.ListenAndServe(":"+port, r); err != nil {
 			log.Fatal().Stack().Err(err).Msg("failed to listen")
 		}
 	}

example/makefile CHANGED Viewed

@@ -14,6 +14,7 @@ generate:
 	gromer -pkg github.com/pyros2097/gromer/example
 	dbmate migrate
+run: export PORT=3000
 run: export DATABASE_URL=postgres://postgres:demo@127.0.0.1:5432/postgres?sslmode=disable
 run:
 	gow run main.go

http.go CHANGED Viewed

@@ -22,12 +22,14 @@ import (
 var info *debug.BuildInfo
 var IsLambda bool
+var IsCloundRun bool
 func init() {
 	IsLambda = os.Getenv("_LAMBDA_SERVER_PORT") != ""
+	IsCloundRun = os.Getenv("K_REVISION") != ""
 	info, _ = debug.ReadBuildInfo()
 	zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
-	if !IsLambda {
+	if !IsLambda || !IsCloundRun {
 		log.Logger = log.Output(zerolog.ConsoleWriter{
 			Out:        os.Stdout,
 			TimeFormat: zerolog.TimeFormatUnix,