summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <[email protected]>2022-03-11 09:48:09 +0100
committerBjørn Erik Pedersen <[email protected]>2022-03-11 13:10:47 +0100
commit5ef8a9f32c25a9b4cc821393c58733e57a7ad234 (patch)
tree3531dd8e2d265d4a1c8f4090170d3e3710dabee0
parent3bc34666c8daf29aa64f834f14f753714bc890f4 (diff)
downloadhugo-5ef8a9f32c25a9b4cc821393c58733e57a7ad234.tar.gz
hugo-5ef8a9f32c25a9b4cc821393c58733e57a7ad234.zip
Revert "Some minor adjustments to the new static filesystem logic"
This reverts commit 63bb2a5b18193602fd442ebafdc85bc36fe05ad2.
-rw-r--r--commands/commandeer.go3
-rw-r--r--commands/server.go4
2 files changed, 3 insertions, 4 deletions
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\".")