Merge 2bf888c into 0c4ce2d

uber · Nov 15, 2018 · 0d98900 · 0d98900
2 parents 0c4ce2d + 2bf888c
commit 0d98900
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 6 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/main.tmpl b/codegen/templates/main.tmpl
@@ -13,6 +13,7 @@ import (
 	"syscall"
 
 	"go.uber.org/zap"
+	"go.uber.org/fx"
 
 	"github.com/uber/zanzibar/config"
 	"github.com/uber/zanzibar/runtime"
@@ -80,6 +81,13 @@ func readFlags() {
 }
 
 func main() {
+	app := fx.New(
+		fx.Invoke(zanzibarMain),
+	)
+	app.Run()
+}
+
+func zanzibarMain() {
 	readFlags()
 	server, err := createGateway()
 	if err != nil {

diff --git a/examples/example-gateway/build/services/echo-gateway/main/main.go b/examples/example-gateway/build/services/echo-gateway/main/main.go
diff --git a/examples/example-gateway/build/services/example-gateway/main/main.go b/examples/example-gateway/build/services/example-gateway/main/main.go
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -67,3 +67,7 @@ import:
   version: master
 - package: gopkg.in/validator.v2
   version: master
+- package: go.uber.org/fx
+
+# Transitive dependency of fx
+- package: go.uber.org/dig