diff --git a/cmd/cardano-node-api/main.go b/cmd/cardano-node-api/main.go index 1d3ed7c..ca35380 100644 --- a/cmd/cardano-node-api/main.go +++ b/cmd/cardano-node-api/main.go @@ -98,11 +98,6 @@ func main() { } // Start API listener - logger.Infof( - "starting API listener on %s:%d", - cfg.Api.ListenAddress, - cfg.Api.ListenPort, - ) go func() { if err := api.Start(cfg); err != nil { logger.Fatalf("failed to start API: %s", err) @@ -110,11 +105,6 @@ func main() { }() // Start UTxO RPC gRPC listener - logger.Infof( - "starting gRPC listener on %s:%d", - cfg.Utxorpc.ListenAddress, - cfg.Utxorpc.ListenPort, - ) if err := utxorpc.Start(cfg); err != nil { logger.Fatalf("failed to start gRPC: %s", err) } diff --git a/internal/api/api.go b/internal/api/api.go index d1be421..897867a 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -42,6 +42,21 @@ import ( // @license.name Apache 2.0 // @license.url http://www.apache.org/licenses/LICENSE-2.0.html func Start(cfg *config.Config) error { + // Standard logging + logger := logging.GetLogger() + if cfg.Tls.CertFilePath != "" && cfg.Tls.KeyFilePath != "" { + logger.Infof( + "starting API TLS listener on %s:%d", + cfg.Api.ListenAddress, + cfg.Api.ListenPort, + ) + } else { + logger.Infof( + "starting API listener on %s:%d", + cfg.Api.ListenAddress, + cfg.Api.ListenPort, + ) + } // Disable gin debug and color output gin.SetMode(gin.ReleaseMode) gin.DisableConsoleColor() @@ -50,8 +65,6 @@ func Start(cfg *config.Config) error { router := gin.New() // Catch panics and return a 500 router.Use(gin.Recovery()) - // Standard logging - logger := logging.GetLogger() // Access logging accessLogger := logging.GetAccessLogger() skipPaths := []string{} diff --git a/internal/utxorpc/api.go b/internal/utxorpc/api.go index 65366f5..288eeea 100644 --- a/internal/utxorpc/api.go +++ b/internal/utxorpc/api.go @@ -29,9 +29,25 @@ import ( "golang.org/x/net/http2/h2c" "github.com/blinklabs-io/cardano-node-api/internal/config" + "github.com/blinklabs-io/cardano-node-api/internal/logging" ) func Start(cfg *config.Config) error { + // Standard logging + logger := logging.GetLogger() + if cfg.Tls.CertFilePath != "" && cfg.Tls.KeyFilePath != "" { + logger.Infof( + "starting gRPC TLS listener on %s:%d", + cfg.Utxorpc.ListenAddress, + cfg.Utxorpc.ListenPort, + ) + } else { + logger.Infof( + "starting gRPC listener on %s:%d", + cfg.Utxorpc.ListenAddress, + cfg.Utxorpc.ListenPort, + ) + } mux := http.NewServeMux() compress1KB := connect.WithCompressMinBytes(1024) queryPath, queryHandler := queryconnect.NewQueryServiceHandler(