Do not log if config is empty. (#1079) (9b37cbef) · Commits · public-projects / Nakama

internal/satori/satori.go

+18 −11

Original line number	Diff line number	Diff line
		@@ -59,7 +59,9 @@ func NewSatoriClient(logger *zap.Logger, satoriUrl, apiKeyName, apiKey, signingK
		tokenExpirySec: 3600,
		}

		if err := sc.validateConfig(); err != nil {
		if sc.urlString == "" && sc.apiKeyName == "" && sc.apiKey == "" && sc.signingKey == "" {
		sc.invalidConfig = true
		} else if err := sc.validateConfig(); err != nil {
		sc.invalidConfig = true
		logger.Warn(err.Error())
		}
		@@ -69,10 +71,12 @@ func NewSatoriClient(logger *zap.Logger, satoriUrl, apiKeyName, apiKey, signingK

		func (s *SatoriClient) validateConfig() error {
		errorStrings := make([]string, 0)
		if s.url == nil {
		_, err := url.Parse(s.urlString)
		satoriUrl, err := url.Parse(s.urlString)
		if err != nil {
		errorStrings = append(errorStrings, fmt.Sprintf("Invalid URL: %s", err.Error()))
		}

		if satoriUrl.String() != "" {
		if s.apiKeyName == "" {
		errorStrings = append(errorStrings, "api_key_name not set")
		}
		@@ -82,6 +86,9 @@ func (s *SatoriClient) validateConfig() error {
		if s.signingKey == "" {
		errorStrings = append(errorStrings, "signing_key not set")
		}
		} else if s.apiKeyName != "" \|\| s.apiKey != "" \|\| s.signingKey != "" {
		errorStrings = append(errorStrings, "Satori configuration incomplete: url not set")
		}

		if len(errorStrings) > 0 {
		return fmt.Errorf("Satori configuration invalid: %s.", strings.Join(errorStrings, ", "))