daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2115 from yixizhang/health 

Use app.driver.Stat for registry health check
master
Derek McGowan 2017-01-03 12:50:18 -08:00 committed by GitHub
parent 8e065ad239 8e915d69f4
commit 76f514b618
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
registry/handlers/app.go
View File

@ -345,7 +345,7 @@ func (app *App) RegisterHealthChecks(healthRegistries ...*health.Registry) {
} }
storageDriverCheck := func() error { storageDriverCheck := func() error {
_, err := app.driver.List(app, "/") // "/" should always exist _, err := app.driver.Stat(app, "/") // "/" should always exist
return err // any error will be treated as failure return err // any error will be treated as failure
} }

2
registry/storage/driver/base/base.go
View File

@ -137,7 +137,7 @@ func (base *Base) Stat(ctx context.Context, path string) (storagedriver.FileInfo
ctx, done := context.WithTrace(ctx) ctx, done := context.WithTrace(ctx)
defer done("%s.Stat(%q)", base.Name(), path) defer done("%s.Stat(%q)", base.Name(), path)
if !storagedriver.PathRegexp.MatchString(path) { if !storagedriver.PathRegexp.MatchString(path) && path != "/" {
return nil, storagedriver.InvalidPathError{Path: path, DriverName: base.StorageDriver.Name()} return nil, storagedriver.InvalidPathError{Path: path, DriverName: base.StorageDriver.Name()}
} }