diff options
-rw-r--r-- | internal/source/disk/config.go (renamed from internal/source/groups/config.go) | 2 | ||||
-rw-r--r-- | internal/source/disk/config_test.go (renamed from internal/source/groups/config_test.go) | 2 | ||||
-rw-r--r-- | internal/source/disk/group.go (renamed from internal/source/groups/group.go) | 2 | ||||
-rw-r--r-- | internal/source/disk/group_domain_test.go (renamed from internal/source/groups/group_domain_test.go) | 2 | ||||
-rw-r--r-- | internal/source/disk/group_test.go (renamed from internal/source/groups/group_test.go) | 2 | ||||
-rw-r--r-- | internal/source/disk/map.go (renamed from internal/source/groups/map.go) | 2 | ||||
-rw-r--r-- | internal/source/disk/map_test.go (renamed from internal/source/groups/map_test.go) | 2 | ||||
-rw-r--r-- | internal/source/domains.go | 8 |
8 files changed, 11 insertions, 11 deletions
diff --git a/internal/source/groups/config.go b/internal/source/disk/config.go index 88947259..de3576d2 100644 --- a/internal/source/groups/config.go +++ b/internal/source/disk/config.go @@ -1,4 +1,4 @@ -package groups +package disk import ( "encoding/json" diff --git a/internal/source/groups/config_test.go b/internal/source/disk/config_test.go index ed563b87..c0e22c04 100644 --- a/internal/source/groups/config_test.go +++ b/internal/source/disk/config_test.go @@ -1,4 +1,4 @@ -package groups +package disk import ( "io/ioutil" diff --git a/internal/source/groups/group.go b/internal/source/disk/group.go index e5534cf6..fd96124d 100644 --- a/internal/source/groups/group.go +++ b/internal/source/disk/group.go @@ -1,4 +1,4 @@ -package groups +package disk import ( "errors" diff --git a/internal/source/groups/group_domain_test.go b/internal/source/disk/group_domain_test.go index b48aa771..8fcb0f1b 100644 --- a/internal/source/groups/group_domain_test.go +++ b/internal/source/disk/group_domain_test.go @@ -1,4 +1,4 @@ -package groups +package disk import ( "compress/gzip" diff --git a/internal/source/groups/group_test.go b/internal/source/disk/group_test.go index a8070c87..2aa3fc4e 100644 --- a/internal/source/groups/group_test.go +++ b/internal/source/disk/group_test.go @@ -1,4 +1,4 @@ -package groups +package disk import ( "strings" diff --git a/internal/source/groups/map.go b/internal/source/disk/map.go index 670c9bb8..66c0a72c 100644 --- a/internal/source/groups/map.go +++ b/internal/source/disk/map.go @@ -1,4 +1,4 @@ -package groups +package disk import ( "bytes" diff --git a/internal/source/groups/map_test.go b/internal/source/disk/map_test.go index 2acb9f20..9aa96072 100644 --- a/internal/source/groups/map_test.go +++ b/internal/source/disk/map_test.go @@ -1,4 +1,4 @@ -package groups +package disk import ( "crypto/rand" diff --git a/internal/source/domains.go b/internal/source/domains.go index 5e7f113c..54a269d8 100644 --- a/internal/source/domains.go +++ b/internal/source/domains.go @@ -6,13 +6,13 @@ import ( "time" "gitlab.com/gitlab-org/gitlab-pages/internal/domain" - "gitlab.com/gitlab-org/gitlab-pages/internal/source/groups" + "gitlab.com/gitlab-org/gitlab-pages/internal/source/disk" ) // Domains struct represents a map of all domains supported by pages. It is // currently reading them from disk. type Domains struct { - dm groups.Map + dm disk.Map lock sync.RWMutex } @@ -45,10 +45,10 @@ func (d *Domains) Ready() bool { // Watch starts the domain source, in this case it is reading domains from // groups on disk concurrently func (d *Domains) Watch(rootDomain string) { - go groups.Watch(rootDomain, d.updateDomains, time.Second) + go disk.Watch(rootDomain, d.updateDomains, time.Second) } -func (d *Domains) updateDomains(dm groups.Map) { +func (d *Domains) updateDomains(dm disk.Map) { d.lock.Lock() defer d.lock.Unlock() |