From f70bb0a513807e46fa56c002f5d208b795dc5593 Mon Sep 17 00:00:00 2001 From: Megan O'Keefe Date: Wed, 19 Feb 2020 08:58:40 -0500 Subject: [PATCH] go svc cleanup --- .../org.eclipse.buildship.core.prefs | 2 -- src/checkoutservice/main.go | 31 ++----------------- src/frontend/main.go | 28 ++--------------- src/productcatalogservice/server.go | 31 ++----------------- src/shippingservice/main.go | 31 ++----------------- 5 files changed, 11 insertions(+), 112 deletions(-) delete mode 100644 src/adservice/.settings/org.eclipse.buildship.core.prefs diff --git a/src/adservice/.settings/org.eclipse.buildship.core.prefs b/src/adservice/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index e889521..0000000 --- a/src/adservice/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir= -eclipse.preferences.version=1 diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go index 882c5ee..891d10c 100644 --- a/src/checkoutservice/main.go +++ b/src/checkoutservice/main.go @@ -19,7 +19,6 @@ import ( "fmt" "net" "os" - "strconv" "time" "cloud.google.com/go/profiler" @@ -70,18 +69,14 @@ type checkoutService struct { } func main() { - statsEnabled := os.Getenv("DISABLE_STATS") == "" - traceEnabled := os.Getenv("DISABLE_TRACING") == "" - profilerEnabled := os.Getenv("DISABLE_PROFILER") == "" - - if traceEnabled { + if os.Getenv("DISABLE_TRACING") == "" { log.Info("Tracing enabled.") go initTracing() } else { log.Info("Tracing disabled.") } - if profilerEnabled { + if os.Getenv("DISABLE_PROFILER") == "" { log.Info("Profiling enabled.") go initProfiling("checkoutservice", "1.0.0") } else { @@ -109,7 +104,7 @@ func main() { } var srv *grpc.Server - if statsEnabled { + if os.Getenv("DISABLE_STATS") == "" { log.Info("Stats enabled.") srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) } else { @@ -433,23 +428,3 @@ func (cs *checkoutService) shipOrder(ctx context.Context, address *pb.Address, i } // TODO: Dial and create client once, reuse. - -func getenvBool(key string) (bool, error) { - s, err := getenvStr(key) - if err != nil { - return false, err - } - v, err := strconv.ParseBool(s) - if err != nil { - return false, err - } - return v, nil -} - -func getenvStr(key string) (string, error) { - v := os.Getenv(key) - if v == "" { - return v, fmt.Errorf("empty var") - } - return v, nil -} diff --git a/src/frontend/main.go b/src/frontend/main.go index 7259a93..61854fa 100644 --- a/src/frontend/main.go +++ b/src/frontend/main.go @@ -19,7 +19,6 @@ import ( "fmt" "net/http" "os" - "strconv" "time" "cloud.google.com/go/profiler" @@ -95,17 +94,14 @@ func main() { } log.Out = os.Stdout - traceEnabled := os.Getenv("DISABLE_TRACING") == "" - profilerEnabled := os.Getenv("DISABLE_PROFILER") == "" - - if traceEnabled { + if os.Getenv("DISABLE_TRACING") == "" { log.Info("Tracing enabled.") go initTracing(log) } else { log.Info("Tracing disabled.") } - if profilerEnabled { + if os.Getenv("DISABLE_PROFILER") == "" { log.Info("Profiling enabled.") go initProfiling(log, "frontend", "1.0.0") } else { @@ -275,23 +271,3 @@ func mustConnGRPC(ctx context.Context, conn **grpc.ClientConn, addr string) { panic(errors.Wrapf(err, "grpc: failed to connect %s", addr)) } } - -func getenvBool(key string) (bool, error) { - s, err := getenvStr(key) - if err != nil { - return false, err - } - v, err := strconv.ParseBool(s) - if err != nil { - return false, err - } - return v, nil -} - -func getenvStr(key string) (string, error) { - v := os.Getenv(key) - if v == "" { - return v, fmt.Errorf("empty var") - } - return v, nil -} diff --git a/src/productcatalogservice/server.go b/src/productcatalogservice/server.go index 75394e1..00172f4 100644 --- a/src/productcatalogservice/server.go +++ b/src/productcatalogservice/server.go @@ -23,7 +23,6 @@ import ( "net" "os" "os/signal" - "strconv" "strings" "sync" "syscall" @@ -76,18 +75,14 @@ func init() { } func main() { - statsEnabled = os.Getenv("DISABLE_STATS") == "" - traceEnabled := os.Getenv("DISABLE_TRACING") == "" - profilerEnabled := os.Getenv("DISABLE_PROFILER") == "" - - if traceEnabled { + if os.Getenv("DISABLE_TRACING") == "" { log.Info("Tracing enabled.") go initTracing() } else { log.Info("Tracing disabled.") } - if profilerEnabled { + if os.Getenv("DISABLE_PROFILER") == "" { log.Info("Profiling enabled.") go initProfiling("productcatalogservice", "1.0.0") } else { @@ -138,7 +133,7 @@ func run(port string) string { log.Fatal(err) } var srv *grpc.Server - if statsEnabled { + if os.Getenv("DISABLE_STATS") == "" { log.Info("Stats enabled.") srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) } else { @@ -302,23 +297,3 @@ func (p *productCatalog) SearchProducts(ctx context.Context, req *pb.SearchProdu } return &pb.SearchProductsResponse{Results: ps}, nil } - -func getenvBool(key string) (bool, error) { - s, err := getenvStr(key) - if err != nil { - return false, err - } - v, err := strconv.ParseBool(s) - if err != nil { - return false, err - } - return v, nil -} - -func getenvStr(key string) (string, error) { - v := os.Getenv(key) - if v == "" { - return v, fmt.Errorf("empty var") - } - return v, nil -} diff --git a/src/shippingservice/main.go b/src/shippingservice/main.go index dde1f0b..41dfbbe 100644 --- a/src/shippingservice/main.go +++ b/src/shippingservice/main.go @@ -18,7 +18,6 @@ import ( "fmt" "net" "os" - "strconv" "time" "cloud.google.com/go/profiler" @@ -59,18 +58,14 @@ func init() { } func main() { - statsEnabled := os.Getenv("DISABLE_STATS") == "" - traceEnabled := os.Getenv("DISABLE_TRACING") == "" - profilerEnabled := os.Getenv("DISABLE_PROFILER") == "" - - if traceEnabled { + if os.Getenv("DISABLE_TRACING") == "" { log.Info("Tracing enabled.") go initTracing() } else { log.Info("Tracing disabled.") } - if profilerEnabled { + if os.Getenv("DISABLE_PROFILER") == "" { log.Info("Profiling enabled.") go initProfiling("shippingservice", "1.0.0") } else { @@ -89,7 +84,7 @@ func main() { } var srv *grpc.Server - if statsEnabled { + if os.Getenv("DISABLE_STATS") == "" { log.Info("Stats enabled.") srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) } else { @@ -240,23 +235,3 @@ func initProfiling(service, version string) { } log.Warn("could not initialize Stackdriver profiler after retrying, giving up") } - -func getenvBool(key string) (bool, error) { - s, err := getenvStr(key) - if err != nil { - return false, err - } - v, err := strconv.ParseBool(s) - if err != nil { - return false, err - } - return v, nil -} - -func getenvStr(key string) (string, error) { - v := os.Getenv(key) - if v == "" { - return v, fmt.Errorf("empty var") - } - return v, nil -}