github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-16 20:38:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(log): replace panics with log fatal or log panic functions (#1723)

Browse Source 
Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>
This commit is contained in:
LaurentiuNiculae
2023-11-24 10:38:36 +02:00
committed by GitHub
parent 83f287d1f6
commit 92837c2bcb
22 changed files with 969 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/meta/meta.go
+13 -4
View File
@@ -43,7 +43,10 @@ func Create(dbtype string, dbDriver, parameters interface{}, log log.Logger, //n
{
properDriver, ok := dbDriver.(*bbolt.DB)
if !ok {
panic("failed type assertion")
log.Error().Err(errors.ErrTypeAssertionFailed).Msgf("expected type '%T' but got '%T'",
&bbolt.DB{}, dbDriver)
return nil, errors.ErrTypeAssertionFailed
}
return boltdb.New(properDriver, log)
@@ -52,12 +55,18 @@ func Create(dbtype string, dbDriver, parameters interface{}, log log.Logger, //n
{
properDriver, ok := dbDriver.(*dynamodb.Client)
if !ok {
panic("failed type assertion")
log.Error().Err(errors.ErrTypeAssertionFailed).Msgf("expected type '%T' but got '%T'",
&dynamodb.Client{}, dbDriver)
return nil, errors.ErrTypeAssertionFailed
}
properParameters, ok := parameters.(mdynamodb.DBDriverParameters)
if !ok {
panic("failed type assertion")
log.Error().Err(errors.ErrTypeAssertionFailed).Msgf("expected type '%T' but got '%T'",
mdynamodb.DBDriverParameters{}, parameters)
return nil, errors.ErrTypeAssertionFailed
}
return mdynamodb.New(properDriver, properParameters, log)
@@ -97,7 +106,7 @@ func getDynamoParams(cacheDriverConfig map[string]interface{}, log log.Logger) m
allParametersOk = allParametersOk && ok
if !allParametersOk {
panic("dynamo parameters are not specified correctly, can't proceede")
log.Panic().Msg("dynamo parameters are not specified correctly, can't proceed")
}
return mdynamodb.DBDriverParameters{
pkg/meta/meta_test.go
+6 -3
View File
@@ -2488,9 +2488,11 @@ func TestCreateDynamo(t *testing.T) {
Convey("Fails", t, func() {
log := log.NewLogger("debug", "")
So(func() { _, _ = meta.Create("dynamodb", nil, boltdb.DBParameters{RootDir: "root"}, log) }, ShouldPanic)
_, err := meta.Create("dynamodb", nil, boltdb.DBParameters{RootDir: "root"}, log)
So(err, ShouldNotBeNil)
So(func() { _, _ = meta.Create("dynamodb", &dynamodb.Client{}, "bad", log) }, ShouldPanic)
_, err = meta.Create("dynamodb", &dynamodb.Client{}, "bad", log)
So(err, ShouldNotBeNil)
metaDB, err := meta.Create("random", nil, boltdb.DBParameters{RootDir: "root"}, log)
So(metaDB, ShouldBeNil)
@@ -2517,6 +2519,7 @@ func TestCreateBoltDB(t *testing.T) {
Convey("fails", t, func() {
log := log.NewLogger("debug", "")
So(func() { _, _ = meta.Create("boltdb", nil, mdynamodb.DBDriverParameters{}, log) }, ShouldPanic)
_, err := meta.Create("boltdb", nil, mdynamodb.DBDriverParameters{}, log)
So(err, ShouldNotBeNil)
})
}