diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-11-08 10:24:13 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-11-13 14:19:42 +0100 |
commit | f7aeaa61291dd75f92901bcbeecc7fce07a28dec (patch) | |
tree | 409c03e259a38fce2beeab46655fd5108c84cd5c /common/hugio | |
parent | 7d78a2afd3c4a6c4af77a4ddcbd2a82f15986048 (diff) |
Add a consolidated file cache
This commits reworks how file caching is performed in Hugo. Now there is only one way, and it can be configured.
This is the default configuration:
```toml
[caches]
[caches.getjson]
dir = ":cacheDir"
maxAge = -1
[caches.getcsv]
dir = ":cacheDir"
maxAge = -1
[caches.images]
dir = ":resourceDir/_gen"
maxAge = -1
[caches.assets]
dir = ":resourceDir/_gen"
maxAge = -1
```
You can override any of these cache setting in your own `config.toml`.
The placeholders explained:
`:cacheDir`: This is the value of the `cacheDir` config option if set (can also be set via OS env variable `HUGO_CACHEDIR`). It will fall back to `/opt/build/cache/hugo_cache/` on Netlify, or a `hugo_cache` directory below the OS temp dir for the others.
`:resourceDir`: This is the value of the `resourceDir` config option.
`maxAge` is the time in seconds before a cache entry will be evicted, -1 means forever and 0 effectively turns that particular cache off.
This means that if you run your builds on Netlify, all caches configured with `:cacheDir` will be saved and restored on the next build. For other CI vendors, please read their documentation. For an CircleCI example, see https://github.com/bep/hugo-sass-test/blob/6c3960a8f4b90e8938228688bc49bdcdd6b2d99e/.circleci/config.yml
Fixes #5404
Diffstat (limited to 'common/hugio')
-rw-r--r-- | common/hugio/writers.go | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/common/hugio/writers.go b/common/hugio/writers.go index 2766146e1..82c4dca52 100644 --- a/common/hugio/writers.go +++ b/common/hugio/writers.go @@ -15,6 +15,7 @@ package hugio import ( "io" + "io/ioutil" ) type multiWriteCloser struct { @@ -41,3 +42,35 @@ func NewMultiWriteCloser(writeClosers ...io.WriteCloser) io.WriteCloser { } return multiWriteCloser{Writer: io.MultiWriter(writers...), closers: writeClosers} } + +// ToWriteCloser creates an io.WriteCloser from the given io.Writer. +// If it's not already, one will be created with a Close method that does nothing. +func ToWriteCloser(w io.Writer) io.WriteCloser { + if rw, ok := w.(io.WriteCloser); ok { + return rw + } + + return struct { + io.Writer + io.Closer + }{ + w, + ioutil.NopCloser(nil), + } +} + +// ToReadCloser creates an io.ReadCloser from the given io.Reader. +// If it's not already, one will be created with a Close method that does nothing. +func ToReadCloser(r io.Reader) io.ReadCloser { + if rc, ok := r.(io.ReadCloser); ok { + return rc + } + + return struct { + io.Reader + io.Closer + }{ + r, + ioutil.NopCloser(nil), + } +} |