Skip to content

Commit c007e4a

Browse files
committed
heroku build fix
1 parent 30f5755 commit c007e4a

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.env

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CHATPORT=3333

Procfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
web: bin/proxy
2-
worker: bin/chat
2+
worker: bin/chat -listen=":$CHATPORT"

src/proxy/proxy.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,35 @@ func main() {
1313
if port == "" {
1414
log.Fatal("$PORT must be set")
1515
}
16-
chat := os.Getenv("CHAT")
16+
chat := os.Getenv("CHATPORT")
1717
if chat == "" {
18-
log.Fatal("$CHAT must be set")
18+
log.Fatal("$CHATPORT must be set")
1919
}
20-
2120
wd, err := os.Getwd()
2221
if err != nil {
23-
log.Fatal(err)
24-
}
25-
index, err := indexHandler(wd)
26-
if err != nil {
27-
log.Fatal(err)
22+
log.Fatalf("can not get os working directory: %v", err)
2823
}
24+
2925
web := http.FileServer(http.Dir(wd + "/web"))
3026

31-
http.Handle("/", index)
27+
http.Handle("/", web)
3228
http.Handle("/web/", http.StripPrefix("/web/", web))
33-
http.Handle("/ws", wsHandler(chat))
29+
http.Handle("/ws", wsHandler(":"+chat))
3430

31+
log.Printf("proxy is listening on localhost:%v", port)
3532
log.Fatal(http.ListenAndServe(":"+port, nil))
3633
}
3734

3835
func wsHandler(upstream string) http.Handler {
3936
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
4037
peer, err := net.Dial("tcp", upstream)
4138
if err != nil {
39+
log.Printf("dial upstream error: %v", err)
4240
w.WriteHeader(502)
4341
return
4442
}
4543
if err := r.Write(peer); err != nil {
44+
log.Printf("write request to upstream error: %v", err)
4645
w.WriteHeader(502)
4746
return
4847
}

0 commit comments

Comments
 (0)