townhall: Single-binary build

This commit is contained in:
Łukasz Magiera 2019-10-11 08:11:57 +02:00
parent 68f613e8de
commit 20cf5ba54c
4 changed files with 13 additions and 3 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
/lotus /lotus
/lotus-storage-miner /lotus-storage-miner
/pond /pond
/townhall
/lotuspond/front/node_modules /lotuspond/front/node_modules
/lotuspond/front/build /lotuspond/front/build
**/*.h **/*.h

View File

@ -88,6 +88,13 @@ pond: build
(cd lotuspond/front && npm i && npm run build) (cd lotuspond/front && npm i && npm run build)
.PHONY: pond .PHONY: pond
townhall:
rm -f townhall
go build -o townhall ./cmd/lotus-townhall
(cd ./cmd/lotus-townhall/townhall && npm i && npm run build)
go run github.com/GeertJohan/go.rice/rice append --exec townhall -i ./cmd/lotus-townhall
.PHONY: townhall
clean: clean:
rm -rf $(CLEAN) rm -rf $(CLEAN)
-$(MAKE) -C $(BLS_PATH) clean -$(MAKE) -C $(BLS_PATH) clean

View File

@ -7,6 +7,7 @@ import (
"net/http" "net/http"
"strings" "strings"
rice "github.com/GeertJohan/go.rice"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/peer"
@ -59,8 +60,9 @@ func main() {
} }
http.HandleFunc("/sub", handler(ps)) http.HandleFunc("/sub", handler(ps))
http.Handle("/", http.FileServer(rice.MustFindBox("townhall/build").HTTPBox()))
fmt.Println("listening") fmt.Println("listening on http://localhost:2975")
if err := http.ListenAndServe("0.0.0.0:2975", nil); err != nil { if err := http.ListenAndServe("0.0.0.0:2975", nil); err != nil {
panic(err) panic(err)

View File

@ -5,8 +5,8 @@ class App extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
//let ws = new WebSocket("ws://" + window.location.host + "/sub") let ws = new WebSocket("ws://" + window.location.host + "/sub")
let ws = new WebSocket("ws://127.0.0.1:2975/sub") //let ws = new WebSocket("ws://127.0.0.1:2975/sub")
ws.onmessage = (ev) => { ws.onmessage = (ev) => {
console.log(ev) console.log(ev)