certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

node/cmd: rename publicREST to publicWeb 

Should be early enough to make this backwards-incompatible change.

Change-Id: I5ef119e286cac48839c7e20acd7b5efd0513ac78
This commit is contained in:
Leo 2021-08-21 01:52:07 +02:00 committed by Leopold Schabel
parent a587316e7d
commit a35604f811
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bridge/cmd/guardiand/bridge.go
View File

@ -78,8 +78,8 @@ var (
devNumGuardians *uint devNumGuardians *uint
nodeName *string nodeName *string
publicRPC *string publicRPC *string
publicREST *string publicWeb *string
tlsHostname *string tlsHostname *string
tlsProdEnv *bool tlsProdEnv *bool
@ -130,9 +130,9 @@ func init() {
nodeName = BridgeCmd.Flags().String("nodeName", "", "Node name to announce in gossip heartbeats") nodeName = BridgeCmd.Flags().String("nodeName", "", "Node name to announce in gossip heartbeats")
publicRPC = BridgeCmd.Flags().String("publicRPC", "", "Listen address for public gRPC interface") publicRPC = BridgeCmd.Flags().String("publicRPC", "", "Listen address for public gRPC interface")
publicREST = BridgeCmd.Flags().String("publicREST", "", "Listen address for public REST and gRPC Web interface") publicWeb = BridgeCmd.Flags().String("publicWeb", "", "Listen address for public REST and gRPC Web interface")
tlsHostname = BridgeCmd.Flags().String("tlsHostname", "", "If set, serve publicREST as TLS with this hostname using Let's Encrypt") tlsHostname = BridgeCmd.Flags().String("tlsHostname", "", "If set, serve publicWeb as TLS with this hostname using Let's Encrypt")
tlsProdEnv = BridgeCmd.Flags().Bool("tlsProdEnv", false, tlsProdEnv = BridgeCmd.Flags().Bool("tlsProdEnv", false,
"Use the production Let's Encrypt environment instead of staging") "Use the production Let's Encrypt environment instead of staging")
@ -445,7 +445,7 @@ func runBridge(cmd *cobra.Command, args []string) {
logger.Fatal("failed to create admin service socket", zap.Error(err)) logger.Fatal("failed to create admin service socket", zap.Error(err))
} }
publicrestService, err := publicrestServiceRunnable(logger, *publicREST, *adminSocketPath, publicrpcServer, publicwebService, err := publicwebServiceRunnable(logger, *publicWeb, *adminSocketPath, publicrpcServer,
*tlsHostname, *tlsProdEnv, path.Join(*dataDir, "autocert")) *tlsHostname, *tlsProdEnv, path.Join(*dataDir, "autocert"))
if err != nil { if err != nil {
log.Fatal("failed to create publicrpc service socket", zap.Error(err)) log.Fatal("failed to create publicrpc service socket", zap.Error(err))
@ -513,8 +513,8 @@ func runBridge(cmd *cobra.Command, args []string) {
return err return err
} }
} }
if *publicREST != "" { if *publicWeb != "" {
if err := supervisor.Run(ctx, "publicrest", publicrestService); err != nil { if err := supervisor.Run(ctx, "publicweb", publicwebService); err != nil {
return err return err
} }
} }

4
bridge/cmd/guardiand/publicrest.go → bridge/cmd/guardiand/publicweb.go
View File

@ -44,7 +44,7 @@ func corsPreflightHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Access-Control-Allow-Methods", strings.Join(methods, ",")) w.Header().Set("Access-Control-Allow-Methods", strings.Join(methods, ","))
} }
func publicrestServiceRunnable( func publicwebServiceRunnable(
logger *zap.Logger, logger *zap.Logger,
listenAddr string, listenAddr string,
upstreamAddr string, upstreamAddr string,
@ -112,7 +112,7 @@ func publicrestServiceRunnable(
supervisor.Signal(ctx, supervisor.SignalHealthy) supervisor.Signal(ctx, supervisor.SignalHealthy)
errC := make(chan error) errC := make(chan error)
go func() { go func() {
logger.Info("publicrest server listening", zap.String("addr", srv.Addr)) logger.Info("publicweb server listening", zap.String("addr", srv.Addr))
if tlsHostname != "" { if tlsHostname != "" {
errC <- srv.ListenAndServeTLS("", "") errC <- srv.ListenAndServeTLS("", "")
} else { } else {