Compare commits

..

4 Commits

Author SHA1 Message Date
Steve
e2480171e5 Merge pull request #214 from revel/master
v1.1.1 hotfix sync
2022-04-12 15:20:35 -07:00
Brenden Soares
d83d2d5891 Merge pull request #213 from revel/hotfix/v1.1.0
Fixed run mode for verbose
2022-04-12 15:19:24 -07:00
notzippy@gmail.com
55b736e588 Fixed run mode for verbose 2022-04-12 15:08:06 -07:00
Brenden Soares
8162ef3ed6 develop v1.2.0-dev 2022-04-12 13:37:12 -07:00
2 changed files with 5 additions and 5 deletions

View File

@@ -209,7 +209,7 @@ func NewHarness(c *model.CommandConfig, paths *model.RevelContainer, runMode str
// Refresh method rebuilds the Revel application and run it on the given port. // Refresh method rebuilds the Revel application and run it on the given port.
// called by the watcher. // called by the watcher.
func (h *Harness) Refresh() (err *utils.SourceError) { func (h *Harness) Refresh() (err *utils.SourceError) {
t := time.Now(); t := time.Now()
fmt.Println("Change detected, recompiling") fmt.Println("Change detected, recompiling")
err = h.refresh() err = h.refresh()
if err != nil && !h.ranOnce && h.useProxy { if err != nil && !h.ranOnce && h.useProxy {
@@ -265,8 +265,8 @@ func (h *Harness) refresh() (err *utils.SourceError) {
if len(h.app.PackagePathMap) > 0 { if len(h.app.PackagePathMap) > 0 {
paths, _ = json.Marshal(h.app.PackagePathMap) paths, _ = json.Marshal(h.app.PackagePathMap)
} }
runMode = fmt.Sprintf(`{"mode":"%s", "specialUseFlag":%v,"packagePathMap":%s}`, h.app.Paths.RunMode, h.config.Verbose[0], string(paths)) runMode = fmt.Sprintf(`{"mode":"%s", "specialUseFlag":%v,"packagePathMap":%s}`, h.app.Paths.RunMode, h.config.GetVerbose(), string(paths))
} }
if err2 := h.app.Cmd(runMode).Start(h.config); err2 != nil { if err2 := h.app.Cmd(runMode).Start(h.config); err2 != nil {
@@ -312,7 +312,7 @@ func (h *Harness) Run() {
paths = append(paths, h.paths.CodePaths...) paths = append(paths, h.paths.CodePaths...)
h.watcher = watcher.NewWatcher(h.paths, false) h.watcher = watcher.NewWatcher(h.paths, false)
h.watcher.Listen(h, paths...) h.watcher.Listen(h, paths...)
go func() { go func() {
if err := h.Refresh(); err != nil { if err := h.Refresh(); err != nil {
utils.Logger.Error("Failed to refresh", "error", err) utils.Logger.Error("Failed to refresh", "error", err)

View File

@@ -6,7 +6,7 @@ package cmd
const ( const (
// Version current Revel version // Version current Revel version
Version = "1.1.0" Version = "1.2.0-dev"
// BuildDate latest commit/release date // BuildDate latest commit/release date
BuildDate = "2022-04-11" BuildDate = "2022-04-11"