From 5ef8a9f32c25a9b4cc821393c58733e57a7ad234 Mon Sep 17 00:00:00 2001 From: Bjørn Erik Pedersen Date: Fri, 11 Mar 2022 09:48:09 +0100 Subject: Revert "Some minor adjustments to the new static filesystem logic" This reverts commit 63bb2a5b18193602fd442ebafdc85bc36fe05ad2. --- commands/commandeer.go | 3 +-- commands/server.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'commands') diff --git a/commands/commandeer.go b/commands/commandeer.go index 7525bf184..07181f244 100644 --- a/commands/commandeer.go +++ b/commands/commandeer.go @@ -412,9 +412,8 @@ func (c *commandeer) loadConfig() error { } if c.Cfg.GetBool("logPathWarnings") { - // Note that we only care about the "dynamic creates" here, - // so skip the static fs. fs.Destination = hugofs.NewCreateCountingFs(fs.Destination) + fs.DestinationStatic = hugofs.NewCreateCountingFs(fs.DestinationStatic) } // To debug hard-to-find path issues. diff --git a/commands/server.go b/commands/server.go index 485f23388..3f5290816 100644 --- a/commands/server.go +++ b/commands/server.go @@ -99,10 +99,10 @@ of a second, you will be able to save and see your changes nearly instantly.`, cc.cmd.Flags().BoolVarP(&cc.serverAppend, "appendPort", "", true, "append port to baseURL") cc.cmd.Flags().BoolVar(&cc.disableLiveReload, "disableLiveReload", false, "watch without enabling live browser reload on rebuild") cc.cmd.Flags().BoolVar(&cc.navigateToChanged, "navigateToChanged", false, "navigate to changed content file on live browser reload") - cc.cmd.Flags().BoolVar(&cc.renderToDisk, "renderToDisk", false, "serve all files from disk (default is from memory)") - cc.cmd.Flags().BoolVar(&cc.renderStaticToDisk, "renderStaticToDisk", false, "serve static files from disk and dynamic files from memory") + cc.cmd.Flags().BoolVar(&cc.renderToDisk, "renderToDisk", false, "render to Destination path (default is render to memory & serve from there)") cc.cmd.Flags().BoolVar(&cc.disableFastRender, "disableFastRender", false, "enables full re-renders on changes") cc.cmd.Flags().BoolVar(&cc.disableBrowserError, "disableBrowserError", false, "do not show build errors in the browser") + cc.cmd.Flags().BoolVar(&cc.renderStaticToDisk, "renderStaticToDisk", false, "render static files to disk but dynamic files render to memory.") cc.cmd.Flags().String("memstats", "", "log memory usage to this file") cc.cmd.Flags().String("meminterval", "100ms", "interval to poll memory usage (requires --memstats), valid time units are \"ns\", \"us\" (or \"µs\"), \"ms\", \"s\", \"m\", \"h\".") -- cgit v1.2.3