summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorTatsushi Demachi <tdemachi@gmail.com>2015-08-16 12:30:22 +0900
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2015-08-22 19:43:15 +0200
commit0c98d8e9ed7013ce722d53ee094f1adc79b90079 (patch)
tree017422e0e4ff04dadd3fb5f183e97651ad6231db /source
parent97eb55da8977f764560b849d1d05af7fbfa91526 (diff)
Use LazyFileReader for reading file contents
Simple ioutil.ReadFile is used for reading file contents but it reads all of the file contents and copies them into the memory and is run in a single goroutine. It causes much memory consumption at copying media files in content directory to publish directory and it is not good at performance. This improves the both issue by replacing ReadFile with LazyFileReader. It postpones reading the file contents until it is really needed. As the result, actual file read is run in parallelized goroutine. It improves performance especially in a really big site. In addition, if this reader is called from io.Copy, it does not copy the file contents into the memory but just copies them into destination file. It improves much memory consumption issue when the site has many media files. Fix #1181
Diffstat (limited to 'source')
-rw-r--r--source/filesystem.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/filesystem.go b/source/filesystem.go
index 7b7ebb6b7..05167701b 100644
--- a/source/filesystem.go
+++ b/source/filesystem.go
@@ -14,10 +14,8 @@
package source
import (
- "bytes"
"github.com/spf13/viper"
"io"
- "io/ioutil"
"os"
"path/filepath"
"regexp"
@@ -114,11 +112,11 @@ func (f *Filesystem) captureFiles() {
if isNonProcessablePath(filePath) {
return nil
}
- data, err := ioutil.ReadFile(filePath)
+ rd, err := NewLazyFileReader(filePath)
if err != nil {
return err
}
- f.add(filePath, bytes.NewBuffer(data))
+ f.add(filePath, rd)
return nil
}