feat/ion-cluster (grpc)

.gitignore

@@ -18,4 +18,4 @@ cmd/avp/avp
 node_modules/
 cover.out
 out
-
+.DS_Store

Makefile

@@ -14,8 +14,8 @@ go_deps:
 	go mod download
 	go generate ./...
 
-build: go_deps
-	go build -o bin/biz $(GO_LDFLAGS) cmd/biz/json-rpc/main.go
+build:
+	go build -o bin/biz $(GO_LDFLAGS) cmd/biz/main.go
 	go build -o bin/islb $(GO_LDFLAGS) cmd/islb/main.go
 	go build -o bin/sfu $(GO_LDFLAGS) cmd/sfu/main.go
 	go build -o bin/avp $(GO_LDFLAGS) cmd/avp/main.go
@@ -35,6 +35,12 @@ test: go_deps start-services
 		-timeout 120s \
 		-coverpkg=${GO_COVERPKGS} -coverprofile=cover.out -covermode=atomic \
 		-v -race ${GO_TESTPKGS}
+
 protos:
-	docker build -t protoc-builder ./pkg/grpc/biz && docker run -v $(CURDIR):/workspace protoc-builder protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative pkg/grpc/biz/biz.proto
+	docker build -t protoc-builder ./protos && \
+	docker run -v $(CURDIR):/workspace protoc-builder \
+	protoc \
+	--go_opt=module=github.com/pion/ion --go_out=. \
+	--go-grpc_opt=module=github.com/pion/ion --go-grpc_out=. \
+	protos/*.proto
 

cmd/avp/main.go

@@ -56,7 +56,7 @@ func load() bool {
 
 func parse() bool {
 
-	flag.StringVar(&file, "c", "conf/conf.toml", "config file")
+	flag.StringVar(&file, "c", "configs/avp.toml", "config file")
 	help := flag.Bool("h", false, "help info")
 	flag.Parse()
 	if !load() {
@@ -82,7 +82,7 @@ func main() {
 
 	log.Infof("--- starting avp node ---")
 
-	node := avp.NewAVP()
+	node := avp.NewAVP("avp")
 	if err := node.Start(conf); err != nil {
 		log.Errorf("avp start error: %v", err)
 		os.Exit(-1)