feat: servers use PORT variable when it exists

crhntr · Jul 9, 2024 · 3021bde · 3021bde
1 parent b921bde
commit 3021bde
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 15 deletions.
diff --git a/bulk-update/main.go b/bulk-update/main.go
@@ -2,12 +2,14 @@ package main
 
 import (
 	"bytes"
+	"cmp"
 	"context"
 	"database/sql"
 	"embed"
 	"html/template"
 	"log"
 	"net/http"
+	"os"
 	"strconv"
 
 	"github.com/crhntr/httplog"
@@ -35,7 +37,7 @@ func main() {
 	mux := server.routes()
 	h := httplog.Wrap(mux)
 	log.Println("starting server")
-	log.Fatal(http.ListenAndServe(":8080", h))
+	log.Fatal(http.ListenAndServe(":"+cmp.Or(os.Getenv("PORT"), ":8080"), h))
 }
 
 func must[T any](value T, err error) T {
@@ -98,9 +100,7 @@ func (server *Server) setActiveStatus(res http.ResponseWriter, req *http.Request
 }
 
 func (server *Server) writePage(res http.ResponseWriter, _ *http.Request, name string, status int, data any) {
-	var (
-		buf bytes.Buffer
-	)
+	var buf bytes.Buffer
 	err := server.templates.ExecuteTemplate(&buf, name, data)
 	if err != nil {
 		log.Println(err)

diff --git a/click-to-edit/main.go b/click-to-edit/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"cmp"
 	"context"
 	"database/sql"
 	_ "embed"
@@ -10,6 +11,7 @@ import (
 	"html/template"
 	"log"
 	"net/http"
+	"os"
 	"strconv"
 
 	"github.com/crhntr/httplog"
@@ -29,7 +31,7 @@ func main() {
 	server := newServer(database.New(db))
 	h := httplog.Wrap(server.routes())
 	log.Println("starting server")
-	log.Fatal(http.ListenAndServe(":8080", h))
+	log.Fatal(http.ListenAndServe(":"+cmp.Or(os.Getenv("PORT"), ":8080"), h))
 }
 
 func must[T any](value T, err error) T {

diff --git a/click-to-load/main.go b/click-to-load/main.go
@@ -2,10 +2,12 @@ package main
 
 import (
 	"bytes"
+	"cmp"
 	_ "embed"
 	"html/template"
 	"math/rand"
 	"net/http"
+	"os"
 )
 
 //go:embed index.html.template
@@ -29,7 +31,7 @@ func main() {
 		res.WriteHeader(http.StatusOK)
 		_, _ = res.Write(buf.Bytes())
 	})
-	_ = http.ListenAndServe(":8080", nil)
+	_ = http.ListenAndServe(":"+cmp.Or(os.Getenv("PORT"), ":8080"), nil)
 }
 
 func fillWithRandomNumbers(values []int) {

diff --git a/delete-row/main.go b/delete-row/main.go
@@ -2,11 +2,13 @@ package main
 
 import (
 	"bytes"
+	"cmp"
 	_ "embed"
 	"encoding/json"
 	"html/template"
 	"log"
 	"net/http"
+	"os"
 	"path"
 	"slices"
 	"strconv"
@@ -59,7 +61,7 @@ func main() {
 		res.WriteHeader(http.StatusOK)
 		_, _ = res.Write(buf.Bytes())
 	})
-	log.Fatal(http.ListenAndServe(":8080", nil))
+	log.Fatal(http.ListenAndServe(":"+cmp.Or(os.Getenv("PORT"), ":8080"), nil))
 }
 
 type Page struct {

diff --git a/edit-row/main.go b/edit-row/main.go
@@ -2,12 +2,14 @@ package main
 
 import (
 	"bytes"
+	"cmp"
 	_ "embed"
 	"encoding/json"
 	"fmt"
 	"html/template"
 	"log"
 	"net/http"
+	"os"
 	"slices"
 	"strconv"
 	"sync"
@@ -31,7 +33,7 @@ func main() {
 	mux.HandleFunc("GET /", server.index)
 	mux.HandleFunc("GET /edit/{index}", server.getEdit)
 	mux.HandleFunc("POST /edit/{index}", server.postEdit)
-	log.Fatal(http.ListenAndServe(":8080", mux))
+	log.Fatal(http.ListenAndServe(":"+cmp.Or(os.Getenv("PORT"), ":8080"), mux))
 }
 
 type server struct {

diff --git a/infinite-scroll/main.go b/infinite-scroll/main.go
@@ -2,11 +2,13 @@ package main
 
 import (
 	"bytes"
+	"cmp"
 	_ "embed"
 	"fmt"
 	"html/template"
 	"log"
 	"net/http"
+	"os"
 	"strconv"
 )
 
@@ -39,7 +41,7 @@ func main() {
 			NextURL: contactsURL(page + 1),
 		})
 	})
-	log.Fatal(http.ListenAndServe(":8080", mux))
+	log.Fatal(http.ListenAndServe(":"+cmp.Or(os.Getenv("PORT"), ":8080"), mux))
 }
 
 func contactsURL(page int) string {

diff --git a/inline-validation/main.go b/inline-validation/main.go
@@ -2,12 +2,14 @@ package main
 
 import (
 	"bytes"
+	"cmp"
 	"context"
 	_ "embed"
 	"fmt"
 	"html/template"
 	"log"
 	"net/http"
+	"os"
 	"strconv"
 	"time"
 
@@ -179,7 +181,7 @@ func main() {
 		}
 	})
 
-	log.Fatal(http.ListenAndServe(":8080", mux))
+	log.Fatal(http.ListenAndServe(":"+cmp.Or(os.Getenv("PORT"), ":8080"), mux))
 }
 
 func render(res http.ResponseWriter, _ *http.Request, templates *template.Template, code int, name string, data any) {

diff --git a/lazy-loading/main.go b/lazy-loading/main.go
@@ -1,18 +1,20 @@
 package main
 
 import (
+	"cmp"
 	"fmt"
 	"io"
 	"log"
 	"net/http"
+	"os"
 	"time"
 )
 
 func main() {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/", indexHandler)
 	mux.HandleFunc("/endpoint", endpointHandler)
-	log.Fatal(http.ListenAndServe(":8080", mux))
+	log.Fatal(http.ListenAndServe(":"+cmp.Or(os.Getenv("PORT"), ":8080"), mux))
 }
 
 func indexHandler(res http.ResponseWriter, _ *http.Request) {

diff --git a/spreadsheet/main.go b/spreadsheet/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"cmp"
 	_ "embed"
 	"encoding/json"
 	"flag"
@@ -10,6 +11,7 @@ import (
 	"io"
 	"log"
 	"net/http"
+	"os"
 	"regexp"
 	"slices"
 	"strconv"
@@ -31,7 +33,7 @@ func main() {
 		templates: template.Must(template.New("index.html.template").Parse(indexHTMLTemplate)),
 	}
 	log.Println("starting server")
-	log.Fatal(http.ListenAndServe(":8080", s.routes()))
+	log.Fatal(http.ListenAndServe(":"+cmp.Or(os.Getenv("PORT"), ":8080"), s.routes()))
 }
 
 type server struct {
@@ -325,6 +327,7 @@ func (cell *Cell) String() string {
 func (cell *Cell) IDPathParam() string {
 	return fmt.Sprintf("%s%d", columnLabel(cell.Column), cell.Row)
 }
+
 func (cell *Cell) ID() string {
 	return "cell-" + cell.IDPathParam()
 }
@@ -573,9 +576,7 @@ func (node ParenNode) String() string {
 }
 
 func parse(tokens []Token, i, maxColumn, maxRow int) (ExpressionNode, int, error) {
-	var (
-		stack []ExpressionNode
-	)
+	var stack []ExpressionNode
 	for {
 		result, consumed, err := parseNodes(stack, tokens, i, maxColumn, maxRow)
 		if err != nil {