diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-16 02:36:45 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-16 02:36:45 +0800 |
| commit | c302afd411e3f54ba4ee98bec5c964bdcf36adef (patch) | |
| tree | b6a815075e9bf40516eb92bb1556d340ca7265ab /ethereal/html_container.go | |
| parent | 28948d061cfc14d7a5da307a12ebd504b78d2dbb (diff) | |
| parent | 223432fa1eedb9fa5c712056afb804322aa12b02 (diff) | |
| download | go-tangerine-c302afd411e3f54ba4ee98bec5c964bdcf36adef.tar go-tangerine-c302afd411e3f54ba4ee98bec5c964bdcf36adef.tar.gz go-tangerine-c302afd411e3f54ba4ee98bec5c964bdcf36adef.tar.bz2 go-tangerine-c302afd411e3f54ba4ee98bec5c964bdcf36adef.tar.lz go-tangerine-c302afd411e3f54ba4ee98bec5c964bdcf36adef.tar.xz go-tangerine-c302afd411e3f54ba4ee98bec5c964bdcf36adef.tar.zst go-tangerine-c302afd411e3f54ba4ee98bec5c964bdcf36adef.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereal/html_container.go')
| -rw-r--r-- | ethereal/html_container.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ethereal/html_container.go b/ethereal/html_container.go index 1e835eebc..04136f801 100644 --- a/ethereal/html_container.go +++ b/ethereal/html_container.go @@ -8,7 +8,6 @@ import ( "github.com/go-qml/qml" "github.com/howeyc/fsnotify" "io/ioutil" - "log" "net/url" "os" "path" @@ -59,7 +58,7 @@ func (app *HtmlApplication) RootFolder() string { if err != nil { return "" } - return path.Dir(folder.RequestURI()) + return path.Dir(ethutil.WindonizePath(folder.RequestURI())) } func (app *HtmlApplication) RecursiveFolders() []os.FileInfo { files, _ := ioutil.ReadDir(app.RootFolder()) @@ -77,11 +76,13 @@ func (app *HtmlApplication) NewWatcher(quitChan chan bool) { app.watcher, err = fsnotify.NewWatcher() if err != nil { + logger.Infoln("Could not create new auto-reload watcher:", err) return } err = app.watcher.Watch(app.RootFolder()) if err != nil { - log.Fatal(err) + logger.Infoln("Could not start auto-reload watcher:", err) + return } for _, folder := range app.RecursiveFolders() { fullPath := app.RootFolder() + "/" + folder.Name() |