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:
authorJaime Martinez <jmartinez@gitlab.com>2020-08-24 06:48:22 +0300
committerJaime Martinez <jmartinez@gitlab.com>2020-08-27 02:35:55 +0300
commit2023931d6631b23013a01a7494e6456211f7abe6 (patch)
tree615f9c231c91f47be74e7b81685583bda9445706 /internal/source
parent7008be2aed3fb87292c7e8dca06cf9a74a722429 (diff)
Only init disk if configured
Diffstat (limited to 'internal/source')
-rw-r--r--internal/source/domains.go8
1 files changed, 3 insertions, 5 deletions
diff --git a/internal/source/domains.go b/internal/source/domains.go
index e4a582ea..5843e9f2 100644
--- a/internal/source/domains.go
+++ b/internal/source/domains.go
@@ -39,11 +39,7 @@ type Domains struct {
// not initialize `dm` as we later check the readiness by comparing it with a
// nil value.
func NewDomains(config Config) (*Domains, error) {
- domains := &Domains{
- // TODO: disable domains.disk https://gitlab.com/gitlab-org/gitlab-pages/-/issues/382
- disk: disk.New(),
- }
-
+ domains := &Domains{}
if err := domains.setConfigSource(config); err != nil {
return nil, err
}
@@ -67,7 +63,9 @@ func (d *Domains) setConfigSource(config Config) error {
d.configSource = sourceAuto
return d.setGitLabClient(config)
case "disk":
+ // TODO: disable domains.disk https://gitlab.com/gitlab-org/gitlab-pages/-/issues/382
d.configSource = sourceDisk
+ d.disk = disk.New()
default:
return fmt.Errorf("invalid option for -domain-config-source: %q", config.DomainConfigSource())
}