diff options
| author | Henrique Dias <hacdias@gmail.com> | 2016-02-13 12:46:08 +0000 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-02-14 13:50:03 +0100 |
| commit | ad176055d9e87c02da4be405210b297036dd2500 (patch) | |
| tree | 0bc08d591528de62818a1c984bc8cb413789195b /commands | |
| parent | ce7c267140610ea3435a810100dc79a5dee01d5f (diff) | |
Export MainSite var
Fixes hacdias/caddy-hugo#46
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/benchmark.go | 7 | ||||
| -rw-r--r-- | commands/hugo.go | 17 |
2 files changed, 13 insertions, 11 deletions
diff --git a/commands/benchmark.go b/commands/benchmark.go index c90f64516..d10289be4 100644 --- a/commands/benchmark.go +++ b/commands/benchmark.go @@ -14,9 +14,10 @@ package commands import ( - "github.com/spf13/cobra" "os" "runtime/pprof" + + "github.com/spf13/cobra" ) var ( @@ -56,7 +57,7 @@ func benchmark(cmd *cobra.Command, args []string) error { return err } for i := 0; i < benchmarkTimes; i++ { - mainSite = nil + MainSite = nil _ = buildSite() } pprof.WriteHeapProfile(f) @@ -75,7 +76,7 @@ func benchmark(cmd *cobra.Command, args []string) error { pprof.StartCPUProfile(f) defer pprof.StopCPUProfile() for i := 0; i < benchmarkTimes; i++ { - mainSite = nil + MainSite = nil _ = buildSite() } } diff --git a/commands/hugo.go b/commands/hugo.go index ce96e21c9..f363cc7a0 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -46,7 +46,7 @@ import ( "gopkg.in/fsnotify.v1" ) -var mainSite *hugolib.Site +var MainSite *hugolib.Site // userError is an error used to signal different error situations in command handling. type commandError struct { @@ -648,18 +648,19 @@ func getDirList() []string { } func buildSite(watching ...bool) (err error) { + fmt.Println("Started building site") startTime := time.Now() - if mainSite == nil { - mainSite = new(hugolib.Site) + if MainSite == nil { + MainSite = new(hugolib.Site) } if len(watching) > 0 && watching[0] { - mainSite.RunMode.Watching = true + MainSite.RunMode.Watching = true } - err = mainSite.Build() + err = MainSite.Build() if err != nil { return err } - mainSite.Stats() + MainSite.Stats() jww.FEEDBACK.Printf("in %v ms\n", int(1000*time.Since(startTime).Seconds())) return nil @@ -667,11 +668,11 @@ func buildSite(watching ...bool) (err error) { func rebuildSite(events []fsnotify.Event) error { startTime := time.Now() - err := mainSite.ReBuild(events) + err := MainSite.ReBuild(events) if err != nil { return err } - mainSite.Stats() + MainSite.Stats() jww.FEEDBACK.Printf("in %v ms\n", int(1000*time.Since(startTime).Seconds())) return nil |