mirror of
https://github.com/beego/bee.git
synced 2025-06-11 03:10:40 +00:00
Fixes configuration loading since last changes
This commit is contained in:
@ -11,7 +11,6 @@
|
||||
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
// License for the specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package bale
|
||||
|
||||
import (
|
||||
@ -43,8 +42,11 @@ var CmdBale = &commands.Command{
|
||||
It will auto-generate an unpack function to the main package then run it during the runtime.
|
||||
This is mainly used for zealots who are requiring 100% Go code.
|
||||
`,
|
||||
PreRun: func(cmd *commands.Command, args []string) { version.ShowShortVersionBanner() },
|
||||
Run: runBale,
|
||||
PreRun: func(cmd *commands.Command, args []string) {
|
||||
version.ShowShortVersionBanner()
|
||||
config.LoadConfig()
|
||||
},
|
||||
Run: runBale,
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
@ -1,3 +1,16 @@
|
||||
// Copyright 2013 bee authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||
// not use this file except in compliance with the License. You may obtain
|
||||
// a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
// License for the specific language governing permissions and limitations
|
||||
// under the License.
|
||||
package generate
|
||||
|
||||
import (
|
||||
@ -104,6 +117,8 @@ func scaffold(cmd *commands.Command, args []string, currpath string) {
|
||||
beeLogger.Log.Fatal("Wrong number of arguments. Run: bee help generate")
|
||||
}
|
||||
|
||||
config.LoadConfig()
|
||||
|
||||
cmd.Flag.Parse(args[2:])
|
||||
if generate.SQLDriver == "" {
|
||||
generate.SQLDriver = utils.DocValue(config.Conf.Database.Driver)
|
||||
@ -126,6 +141,8 @@ func scaffold(cmd *commands.Command, args []string, currpath string) {
|
||||
}
|
||||
|
||||
func appCode(cmd *commands.Command, args []string, currpath string) {
|
||||
config.LoadConfig()
|
||||
|
||||
cmd.Flag.Parse(args[1:])
|
||||
if generate.SQLDriver == "" {
|
||||
generate.SQLDriver = utils.DocValue(config.Conf.Database.Driver)
|
||||
|
@ -1,3 +1,16 @@
|
||||
// Copyright 2013 bee authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||
// not use this file except in compliance with the License. You may obtain
|
||||
// a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
// License for the specific language governing permissions and limitations
|
||||
// under the License.
|
||||
package migrate
|
||||
|
||||
import (
|
||||
@ -39,8 +52,11 @@ var CmdMigrate = &commands.Command{
|
||||
|
||||
$ bee migrate refresh [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"]
|
||||
`,
|
||||
PreRun: func(cmd *commands.Command, args []string) { version.ShowShortVersionBanner() },
|
||||
Run: RunMigration,
|
||||
PreRun: func(cmd *commands.Command, args []string) {
|
||||
version.ShowShortVersionBanner()
|
||||
config.LoadConfig()
|
||||
},
|
||||
Run: RunMigration,
|
||||
}
|
||||
|
||||
var mDriver utils.DocValue
|
||||
|
@ -11,7 +11,6 @@
|
||||
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
// License for the specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package run
|
||||
|
||||
import (
|
||||
@ -35,8 +34,11 @@ var CmdRun = &commands.Command{
|
||||
Run command will supervise the filesystem of the application for any changes, and recompile/restart it.
|
||||
|
||||
`,
|
||||
PreRun: func(cmd *commands.Command, args []string) { version.ShowShortVersionBanner() },
|
||||
Run: RunApp,
|
||||
PreRun: func(cmd *commands.Command, args []string) {
|
||||
version.ShowShortVersionBanner()
|
||||
config.LoadConfig()
|
||||
},
|
||||
Run: RunApp,
|
||||
}
|
||||
|
||||
var (
|
||||
|
Reference in New Issue
Block a user