Skip to content

Commit

Permalink
Merge pull request #565 from jmpsec/default-logger-tls
Browse files Browse the repository at this point in the history
Different default logger JSON in osctrl-tls and small change to startup messages
  • Loading branch information
javuto authored Nov 10, 2024
2 parents fedc845 + b4a1bbe commit 3cb9aae
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions tls/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ const (
// Default redis configuration file
defRedisConfigurationFile string = "config/redis.json"
// Default Logger configuration file
defLoggerConfigurationFile string = "config/logger.json"
defLoggerConfigurationFile string = "config/logger_tls.json"
// Default carver configuration file
defCarverConfigurationFile string = "config/carver.json"
defCarverConfigurationFile string = "config/carver_tls.json"
// Default TLS certificate file
defTLSCertificateFile string = "config/tls.crt"
// Default TLS private key file
Expand Down Expand Up @@ -715,8 +715,8 @@ func osctrlService() {
}
}()
}

// Initialize TLS handlers before router
log.Info().Msg("Initializing handlers")
handlersTLS = handlers.CreateHandlersTLS(
handlers.WithEnvs(envs),
handlers.WithEnvsMap(&envsmap),
Expand All @@ -731,9 +731,7 @@ func osctrlService() {
)

// ///////////////////////// ALL CONTENT IS UNAUTHENTICATED FOR TLS
if settingsmgr.DebugService(settings.ServiceTLS) {
log.Info().Msg("DebugService: Creating router")
}
log.Info().Msg("Initializing router")
// Create router for TLS endpoint
muxTLS := http.NewServeMux()
// TLS: root
Expand Down

0 comments on commit 3cb9aae

Please sign in to comment.