Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Different default logger JSON in osctrl-tls and small change to startup messages #565

Merged
merged 1 commit into from
Nov 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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