diff options
| author | zelig <viktor.tron@gmail.com> | 2014-07-15 01:32:54 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-07-15 01:32:54 +0800 |
| commit | 353ecbb7d78d9669c42545f152f291f869b39c02 (patch) | |
| tree | f3cbb4ad253708b55001d658737578d9713dca52 /ethereal/html_container.go | |
| parent | 6b296d907b848e2a3dbc78ea5c04c3c3d719d9bd (diff) | |
| parent | e53acdc2ac45fa8953afc3392ed81653d6f26326 (diff) | |
| download | dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.gz dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.bz2 dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.lz dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.xz dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.zst dexon-353ecbb7d78d9669c42545f152f291f869b39c02.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/ethutil-refactor
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() |