diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2020-11-30 03:09:30 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2020-11-30 03:13:03 +0300 |
| commit | 9c51d46d39c1a2614aafca02bf1f3376a88e0280 (patch) | |
| tree | b4148f0c236f878c38ffcd7fda5d91696c93ca27 /internal/serving/disk/zip | |
| parent | aeff2242f8b8fe51bb02539bf73b90bb6cf2ed1b (diff) | |
Add Reconfigure to serving and VFS interfaces
Diffstat (limited to 'internal/serving/disk/zip')
| -rw-r--r-- | internal/serving/disk/zip/serving.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/internal/serving/disk/zip/serving.go b/internal/serving/disk/zip/serving.go index 61d186da..b31d9090 100644 --- a/internal/serving/disk/zip/serving.go +++ b/internal/serving/disk/zip/serving.go @@ -3,6 +3,8 @@ package zip import ( "sync" + "gitlab.com/gitlab-org/labkit/log" + "gitlab.com/gitlab-org/gitlab-pages/internal/config" "gitlab.com/gitlab-org/gitlab-pages/internal/serving" "gitlab.com/gitlab-org/gitlab-pages/internal/serving/disk" @@ -10,14 +12,18 @@ import ( "gitlab.com/gitlab-org/gitlab-pages/internal/vfs/zip" ) -var instance serving.Serving -var once sync.Once +var ( + once sync.Once + instance = disk.New(vfs.Instrumented(zip.New(config.Default.Zip))) +) // Instance returns a serving instance that is capable of reading files // from a zip archives opened from a URL, most likely stored in object storage func Instance() serving.Serving { once.Do(func() { - instance = disk.New(vfs.Instrumented(zip.New(config.Default.Zip))) + if err := instance.Reconfigure(config.Default); err != nil { + log.WithError(err).Fatal("failed to reconfigure zip serving") + } }) return instance |