Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

diagcfg: Allow diagcfg to create logging.config in data directory. #3912

Merged
merged 2 commits into from
Apr 27, 2022
Merged

diagcfg: Allow diagcfg to create logging.config in data directory. #3912

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0003c96
Allow diagcfg to create logging.config in data directory.
winder Apr 24, 2022
c228241
simplify.
winder Apr 25, 2022
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
12 changes: 6 additions & 6 deletions logging/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ func ReadTelemetryConfigOrDefault(dataDir string, genesisID string) (cfg Telemet

configPath, err = config.GetConfigFilePath(TelemetryConfigFilename)
if err != nil {
// In this case we don't know what to do since we couldn't
// create the directory. Just create an ephemeral config.
// In this case we don't know what to do since we couldn't read
// from the global directory. Just create an ephemeral config, if
// the data directory was provided it can be persisted there later.
cfg = createTelemetryConfig()
return
} else {
// Load the telemetry from the default config path
cfg, err = LoadTelemetryConfig(configPath)
}

// Load the telemetry from the default config path
cfg, err = LoadTelemetryConfig(configPath)
}

// If there was some error loading the configuration from the config path...
Expand Down