Skip to content

Use cgi.Serve #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
G-OD wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use cgi.Serve #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05747d1
feat: Use cgi.Serve
Dec 25, 2024
b126aef
feat: Remove docker compose version
Dec 25, 2024
833e67a
feat: Disable CGO so that docker can run the binary again
Dec 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dev:
docker-test: test_mode=true
docker-run: test_mode=false
docker-run docker-test:
GOARCH=amd64 GOOS=linux make build && \
GOARCH=amd64 GOOS=linux CGO_ENABLED=0 make build && \
docker-compose build && \
TEST_MODE=$(test_mode) docker-compose up \
--exit-code-from cgibinftw
1 change: 0 additions & 1 deletion docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.8"
services:
dynamodb-local:
command: "-jar DynamoDBLocal.jar -sharedDb -inMemory"
Expand Down
2 changes: 0 additions & 2 deletions ulticntr/assets/html.go.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Content-Type: text/html

<!DOCTYPE html>

<html>
Expand Down
24 changes: 13 additions & 11 deletions ulticntr/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package main

import (
"bytes"
_ "embed"
"encoding/base64"
"fmt"
"html/template"
"log"
"math/rand"
"net/http"
"net/http/cgi"
"net/url"
"os"
"time"
Expand Down Expand Up @@ -35,8 +36,9 @@ var (
)

func main() {
if err := render(); err != nil {
log.Println("oops:", err)
http.HandleFunc("/", render)
if err := cgi.Serve(nil); err != nil {
log.Fatal(err)
}
}

Expand Down Expand Up @@ -123,24 +125,24 @@ func parseOpts(queryString string) (o []option) {
return o
}

func render() error {
func render(w http.ResponseWriter, r *http.Request) {
t := template.Must(template.New("page").Parse(htmlTemplate))
a := newAssets(parseOpts(os.Getenv("QUERY_STRING"))...)

c, err := counter.New()
if err != nil {
return err
log.Println("oops:", err)
return
}

i, err := c.Count()
if err != nil {
return err
log.Println("oops:", err)
return
}
a.Counter = i
var b bytes.Buffer
if err := t.Execute(&b, a); err != nil {
return err
if err := t.Execute(w, a); err != nil {
log.Println("oops:", err)
return
}
fmt.Println(b.String())
return nil
}