Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarrick S. McDermott <karrick@karrick.net>2020-01-09 18:33:32 +0300
committerKarrick S. McDermott <karrick@karrick.net>2020-01-09 18:34:06 +0300
commit6df90126ae89940648b4c9420084e3fb789b46b5 (patch)
tree808aa242882ea8a1ba5b29d4f2bd0b4dd2a25e28
parent86d619069f226d40d3d0ba97a243db384f133d5f (diff)
dragonfly bsd support by updating godirwalk to v1.14.0
After running `go test` ran `go mod tidy` to cleanup Go module files. Resolves #316
-rw-r--r--go.mod2
-rw-r--r--go.sum6
-rw-r--r--internal/source/disk/map.go11
3 files changed, 9 insertions, 10 deletions
diff --git a/go.mod b/go.mod
index e9a50332..4d893183 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
github.com/gorilla/securecookie v1.1.1
github.com/gorilla/sessions v1.2.0
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
- github.com/karrick/godirwalk v1.10.12
+ github.com/karrick/godirwalk v1.14.0
github.com/kr/pretty v0.1.0 // indirect
github.com/namsral/flag v1.7.4-pre
github.com/patrickmn/go-cache v2.1.0+incompatible
diff --git a/go.sum b/go.sum
index a4d32739..69ad4561 100644
--- a/go.sum
+++ b/go.sum
@@ -59,8 +59,8 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
-github.com/karrick/godirwalk v1.10.12 h1:BqUm+LuJcXjGv1d2mj3gBiQyrQ57a0rYoAmhvJQ7RDU=
-github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
+github.com/karrick/godirwalk v1.14.0 h1:FFk1V9N1Qke8Iv4o6uBQK8HJ6slYM3uSL8tPkiBH8+M=
+github.com/karrick/godirwalk v1.14.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
@@ -75,8 +75,10 @@ github.com/lightstep/lightstep-tracer-go v0.15.6/go.mod h1:6AMpwZpsyCFwSovxzM78e
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/namsral/flag v1.7.4-pre h1:b2ScHhoCUkbsq0d2C15Mv+VU8bl8hAXV8arnWiOHNZs=
diff --git a/internal/source/disk/map.go b/internal/source/disk/map.go
index b5843301..d6a0dd73 100644
--- a/internal/source/disk/map.go
+++ b/internal/source/disk/map.go
@@ -124,8 +124,7 @@ func readProject(group, parent, projectName string, level int, fanIn chan<- jobR
if _, err := os.Lstat(filepath.Join(group, projectPath, "public")); err != nil {
// maybe it's a subgroup
if level <= subgroupScanLimit {
- buf := make([]byte, 2*os.Getpagesize())
- readProjects(group, projectPath, level+1, buf, fanIn)
+ readProjects(group, projectPath, level+1, fanIn)
}
return
@@ -141,9 +140,9 @@ func readProject(group, parent, projectName string, level int, fanIn chan<- jobR
fanIn <- jobResult{group: group, project: projectPath, config: config}
}
-func readProjects(group, parent string, level int, buf []byte, fanIn chan<- jobResult) {
+func readProjects(group, parent string, level int, fanIn chan<- jobResult) {
subgroup := filepath.Join(group, parent)
- fis, err := godirwalk.ReadDirents(subgroup, buf)
+ fis, err := godirwalk.ReadDirents(subgroup, nil)
if err != nil {
log.WithError(err).WithFields(log.Fields{
"group": group,
@@ -177,12 +176,10 @@ func (dm Map) ReadGroups(rootDomain string, fis godirwalk.Dirents) {
wg.Add(1)
go func() {
- buf := make([]byte, 2*os.Getpagesize())
-
for group := range fanOutGroups {
started := time.Now()
- readProjects(group, "", 0, buf, fanIn)
+ readProjects(group, "", 0, fanIn)
log.WithFields(log.Fields{
"group": group,