Remove dependency of third party lib
Showing
1 changed file
with
6 additions
and
17 deletions
| ... | @@ -26,7 +26,6 @@ import ( | ... | @@ -26,7 +26,6 @@ import ( |
| 26 | "github.com/astaxie/beego/logs" | 26 | "github.com/astaxie/beego/logs" |
| 27 | "github.com/astaxie/beego/session" | 27 | "github.com/astaxie/beego/session" |
| 28 | "github.com/astaxie/beego/utils" | 28 | "github.com/astaxie/beego/utils" |
| 29 | "github.com/kelseyhightower/envconfig" | ||
| 30 | ) | 29 | ) |
| 31 | 30 | ||
| 32 | var ( | 31 | var ( |
| ... | @@ -84,14 +83,9 @@ var ( | ... | @@ -84,14 +83,9 @@ var ( |
| 84 | RouterCaseSensitive bool // router case sensitive default is true | 83 | RouterCaseSensitive bool // router case sensitive default is true |
| 85 | ) | 84 | ) |
| 86 | 85 | ||
| 87 | type ( | 86 | type beegoAppConfig struct { |
| 88 | beegoAppConfig struct { | 87 | innerConfig config.ConfigContainer |
| 89 | innerConfig config.ConfigContainer | 88 | } |
| 90 | } | ||
| 91 | beegoEnvConfig struct { | ||
| 92 | RunMode string | ||
| 93 | } | ||
| 94 | ) | ||
| 95 | 89 | ||
| 96 | func newAppConfig(AppConfigProvider, AppConfigPath string) *beegoAppConfig { | 90 | func newAppConfig(AppConfigProvider, AppConfigPath string) *beegoAppConfig { |
| 97 | ac, err := config.NewConfig(AppConfigProvider, AppConfigPath) | 91 | ac, err := config.NewConfig(AppConfigProvider, AppConfigPath) |
| ... | @@ -294,15 +288,10 @@ func init() { | ... | @@ -294,15 +288,10 @@ func init() { |
| 294 | func ParseConfig() (err error) { | 288 | func ParseConfig() (err error) { |
| 295 | AppConfig = newAppConfig(AppConfigProvider, AppConfigPath) | 289 | AppConfig = newAppConfig(AppConfigProvider, AppConfigPath) |
| 296 | 290 | ||
| 297 | var ec beegoEnvConfig | 291 | envRunMode := os.Getenv("BEEGO_RUNMODE") |
| 298 | err = envconfig.Process("beego", &ec) | ||
| 299 | if err != nil { | ||
| 300 | return err | ||
| 301 | } | ||
| 302 | |||
| 303 | // set the runmode first | 292 | // set the runmode first |
| 304 | if ec.RunMode != "" { | 293 | if envRunMode != "" { |
| 305 | RunMode = ec.RunMode | 294 | RunMode = envRunMode |
| 306 | } else if runmode := AppConfig.String("RunMode"); runmode != "" { | 295 | } else if runmode := AppConfig.String("RunMode"); runmode != "" { |
| 307 | RunMode = runmode | 296 | RunMode = runmode |
| 308 | } | 297 | } | ... | ... |
-
Please register or sign in to post a comment