Skip to content

Commit

Permalink
Merge pull request #22 from TRON-US/log-level
Browse files Browse the repository at this point in the history
log level
  • Loading branch information
Eric Chen committed Sep 1, 2020
2 parents 8786282 + 68ef7b0 commit eaa3832
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions env/db/pg.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,68 +50,68 @@ func init() {
writeUserName = _un
} else {
hasError = true
log.Warn(constant.EmptyVarError, zap.String("env", envDbWUnKey))
log.Debug(constant.EmptyVarError, zap.String("env", envDbWUnKey))
}

envDbWPwdKey, _pwd := env.GetEnv("DB_WRITE_PASSWORD")
if _pwd != "" {
writePwd = _pwd
} else {
hasError = true
log.Warn(constant.EmptyVarError, zap.String("env", envDbWPwdKey))
log.Debug(constant.EmptyVarError, zap.String("env", envDbWPwdKey))
}

envDbWHost, _host := env.GetEnv("DB_WRITE_HOST")
if _host != "" {
writeHost = _host
} else {
hasError = true
log.Warn(constant.EmptyVarError, zap.String("env", envDbWHost))
log.Debug(constant.EmptyVarError, zap.String("env", envDbWHost))
}

envDbWNameKey, _dbName := env.GetEnv("DB_WRITE_NAME")
if _dbName != "" {
writeDbName = _dbName
} else {
hasError = true
log.Warn(constant.EmptyVarError, zap.String("env", envDbWNameKey))
log.Debug(constant.EmptyVarError, zap.String("env", envDbWNameKey))
}
envDbRUnKey, un := env.GetEnv("DB_READ_USERNAME")
if un != "" {
readUserName = un
} else {
hasError = true
log.Warn(constant.EmptyVarError, zap.String("env", envDbRUnKey))
log.Debug(constant.EmptyVarError, zap.String("env", envDbRUnKey))
}

envDbRPwdKey, pwd := env.GetEnv("DB_READ_PASSWORD")
if pwd != "" {
readPwd = pwd
} else {
hasError = true
log.Warn(constant.EmptyVarError, zap.String("env", envDbRPwdKey))
log.Debug(constant.EmptyVarError, zap.String("env", envDbRPwdKey))
}

envDbRHostKey, host := env.GetEnv("DB_READ_HOST")
if host != "" {
readHost = host
} else {
hasError = true
log.Warn(constant.EmptyVarError, zap.String("env", envDbRHostKey))
log.Debug(constant.EmptyVarError, zap.String("env", envDbRHostKey))
}

envDbRNameKey, dbName := env.GetEnv("DB_READ_NAME")
if dbName != "" {
readDbName = dbName
} else {
hasError = true
log.Warn(constant.EmptyVarError, zap.String("env", envDbRNameKey))
log.Debug(constant.EmptyVarError, zap.String("env", envDbRNameKey))
}

DBWriteURL = "postgresql://" + writeUserName + ":" + writePwd + "@" + writeHost + ":5432/" + writeDbName
DBReadURL = "postgresql://" + readUserName + ":" + readPwd + "@" + readHost + ":5432/" + readDbName
if hasError {
log.Warn("error to get DBWriteUrl or DBReadURL from env", zap.String("WriteUrl", DBWriteURL), zap.String("ReadUrl", DBReadURL))
log.Debug("error to get DBWriteUrl or DBReadURL from env", zap.String("WriteUrl", DBWriteURL), zap.String("ReadUrl", DBReadURL))
}
}

Expand All @@ -120,14 +120,14 @@ func init() {
}
if envKey, dbst := env.GetEnv("DB_STMT_TIMEOUT"); dbst != "" {
if toInt, err := strconv.ParseInt(dbst, 10, 64); err != nil {
log.Warn(constant.IntConversionError, zap.String("env", envKey), zap.Error(err))
log.Debug(constant.IntConversionError, zap.String("env", envKey), zap.Error(err))
} else {
DBStmtTimeout = time.Duration(toInt) * time.Second
}
}
if envKey, dbnc := env.GetEnv("DB_NUM_CONNS"); dbnc != "" {
if toInt, err := strconv.ParseInt(dbnc, 10, 64); err != nil {
log.Warn(constant.IntConversionError, zap.String("env", envKey), zap.Error(err))
log.Debug(constant.IntConversionError, zap.String("env", envKey), zap.Error(err))
} else {
DBNumConns = int(toInt)
}
Expand Down

0 comments on commit eaa3832

Please sign in to comment.