Skip to content

Commit 0db1178

Browse files
author
franck
committed
add more nformation to the log - include name of the fucntion
1 parent c618343 commit 0db1178

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

main.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func NewConfig(cfg aws.Config) (e Env, err error) {
8181
if ok {
8282
log.Infof("NewConfig Log: DEFAULT_REGION was overridden by local env: %s", defaultRegion)
8383
} else {
84-
log.Fatal("NewConfig Error: DEFAULT_REGION is unset as an environment variable, this is a fatal problem")
84+
log.Fatal("NewConfig fatal: DEFAULT_REGION is unset as an environment variable, this is a fatal problem")
8585
}
8686

8787
cfg.Region = defaultRegion
@@ -92,7 +92,7 @@ func NewConfig(cfg aws.Config) (e Env, err error) {
9292
if ok {
9393
log.Infof("NewConfig Log: STAGE was overridden by local env: %s", stage)
9494
} else {
95-
log.Fatal("NewConfig Error: STAGE is unset as an environment variable, this is a fatal problem")
95+
log.Fatal("NewConfig fatal: STAGE is unset as an environment variable, this is a fatal problem")
9696
}
9797

9898
e.Stage = stage
@@ -127,7 +127,7 @@ func (e Env) Bucket(svc string) string {
127127

128128
// If we have no installation ID we stop
129129
if installationID == "" {
130-
log.Fatal("Bucket Error: installationID is unset, this is a fatal problem")
130+
log.Fatal("Bucket fatal: installationID is unset, this is a fatal problem")
131131
}
132132

133133
// To preserve legacy in case this is the Public Unee-T installation
@@ -160,7 +160,7 @@ func (e Env) Udomain(service string) string {
160160

161161
// If we have no information on the domain then we stop
162162
if domain == "" {
163-
log.Fatal("Udomain error:domain is unset, this is a fatal problem")
163+
log.Fatal("Udomain fatal:domain is unset, this is a fatal problem")
164164
}
165165

166166
// Based on the Environment we are in we do different things
@@ -172,7 +172,7 @@ func (e Env) Udomain(service string) string {
172172
case EnvDemo:
173173
return fmt.Sprintf("%s.demo.%s", service, domain)
174174
default:
175-
log.Fatal("Udomain error: Env is unknown, this is a fatal problem")
175+
log.Fatal("Udomain fatal: Env is unknown, this is a fatal problem")
176176
return ""
177177
}
178178
}
@@ -184,52 +184,52 @@ func (e Env) BugzillaDSN() string {
184184
valbugzillaDbUser, ok := os.LookupEnv("BUGZILLA_DB_USER")
185185
if ok {
186186
bugzillaDbUser = valbugzillaDbUser
187-
log.Infof("BUGZILLA_DB_USER was overridden by local env: %s", valbugzillaDbUser)
187+
log.Infof("BugzillaDSN Log: BUGZILLA_DB_USER was overridden by local env: %s", valbugzillaDbUser)
188188
} else {
189-
log.Fatal("BUGZILLA_DB_USER is unset as an environment variable, this is a fatal problem")
189+
log.Fatal("BugzillaDSN Fatal: BUGZILLA_DB_USER is unset as an environment variable, this is a fatal problem")
190190
}
191191

192192
// Get the value of the variable
193193
var bugzillaDbPassword string
194194
valbugzillaDbPassword, ok := os.LookupEnv("BUGZILLA_DB_PASSWORD")
195195
if ok {
196196
bugzillaDbPassword = valbugzillaDbPassword
197-
log.Infof("BUGZILLA_DB_PASSWORD was overridden by local env: **hidden_secret**")
197+
log.Infof("BugzillaDSN Log: BUGZILLA_DB_PASSWORD was overridden by local env: **hidden_secret**")
198198
} else {
199-
log.Fatal("BUGZILLA_DB_PASSWORD is unset as an environment variable, this is a fatal problem")
199+
log.Fatal("BugzillaDSN Fatal: BUGZILLA_DB_PASSWORD is unset as an environment variable, this is a fatal problem")
200200
}
201201

202202
// Get the value of the variable
203203
var mysqlhost string
204204
valmysqlhost, ok := os.LookupEnv("MYSQL_HOST")
205205
if ok {
206206
mysqlhost = valmysqlhost
207-
log.Infof("MYSQL_HOST was overridden by local env: %s", valmysqlhost)
207+
log.Infof("BugzillaDSN Log: MYSQL_HOST was overridden by local env: %s", valmysqlhost)
208208
} else {
209209
mysqlhost = e.GetSecret("MYSQL_HOST")
210-
log.Fatal("MYSQL_HOST is unset as an environment variable, this is a fatal problem")
210+
log.Fatal("BugzillaDSN Fatal: MYSQL_HOST is unset as an environment variable, this is a fatal problem")
211211
}
212212

213213
// Get the value of the variable
214214
var mysqlport string
215215
valmysqlport, ok := os.LookupEnv("MYSQL_PORT")
216216
if ok {
217217
mysqlport = valmysqlport
218-
log.Infof("MYSQL_PORT was overridden by local env: %s", valmysqlport)
218+
log.Infof("BugzillaDSN Log: MYSQL_PORT was overridden by local env: %s", valmysqlport)
219219
} else {
220220
mysqlport = e.GetSecret("MYSQL_PORT")
221-
log.Fatal("MYSQL_PORT is unset as an environment variable, this is a fatal problem")
221+
log.Fatal("BugzillaDSN Fatal: MYSQL_PORT is unset as an environment variable, this is a fatal problem")
222222
}
223223

224224
// Get the value of the variable
225225
var bugzillaDbName string
226226
valbugzillaDbName, ok := os.LookupEnv("BUGZILLA_DB_NAME")
227227
if ok {
228228
bugzillaDbName = valbugzillaDbName
229-
log.Infof("BUGZILLA_DB_NAME was overridden by local env: %s", valbugzillaDbName)
229+
log.Infof("BugzillaDSN Log: BUGZILLA_DB_NAME was overridden by local env: %s", valbugzillaDbName)
230230
} else {
231231
bugzillaDbName = e.GetSecret("BUGZILLA_DB_NAME")
232-
log.Fatal("BUGZILLA_DB_NAME is unset as an environment variable, this is a fatal problem")
232+
log.Fatal("BugzillaDSN Fatal: BUGZILLA_DB_NAME is unset as an environment variable, this is a fatal problem")
233233
}
234234

235235
// Build the string that will allow connection to the BZ database

0 commit comments

Comments
 (0)