public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misspell: Corrected some misspelled words

Browse Source
This commit is contained in:
Anton Yackushev
2017-06-05 15:20:34 +03:00
parent 1efdd92ae8
commit bab21c9069
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/setting/setting.go
+3 -3
View File
@@ -306,7 +306,7 @@ func evalEnvVarExpression(value string) string {
envVar = strings.TrimSuffix(envVar, "}")
envValue := os.Getenv(envVar)
// if env variable is hostname and it is emtpy use os.Hostname as default
// if env variable is hostname and it is empty use os.Hostname as default
if envVar == "HOSTNAME" && envValue == "" {
envValue, _ = os.Hostname()
}
@@ -635,14 +635,14 @@ func LogConfigurationInfo() {
if len(appliedCommandLineProperties) > 0 {
for _, prop := range appliedCommandLineProperties {
logger.Info("Config overriden from command line", "arg", prop)
logger.Info("Config overridden from command line", "arg", prop)
}
}
if len(appliedEnvOverrides) > 0 {
text.WriteString("\tEnvironment variables used:\n")
for _, prop := range appliedEnvOverrides {
logger.Info("Config overriden from Environment variable", "var", prop)
logger.Info("Config overridden from Environment variable", "var", prop)
}
}
pkg/setting/setting_test.go
+2 -2
View File
@@ -73,7 +73,7 @@ func TestLoadingSettings(t *testing.T) {
So(Domain, ShouldEqual, "test2")
})
Convey("Defaults can be overriden in specified config file", func() {
Convey("Defaults can be overridden in specified config file", func() {
NewConfigContext(&CommandLineArgs{
HomePath: "../../",
Config: filepath.Join(HomePath, "tests/config-files/override.ini"),
@@ -103,7 +103,7 @@ func TestLoadingSettings(t *testing.T) {
So(DataPath, ShouldEqual, "/tmp/env_override")
})
Convey("instance_name default to hostname even if hostname env is emtpy", func() {
Convey("instance_name default to hostname even if hostname env is empty", func() {
NewConfigContext(&CommandLineArgs{
HomePath: "../../",
})