Merge pull request #60 from containerish/logger

Add: Zerolog with FluentBit  Integration

cache/register_for_beta.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"regexp"
 
+	"github.com/containerish/OpenRegistry/types"
 	"github.com/dgraph-io/badger/v3"
 	"github.com/labstack/echo/v4"
 )
@@ -101,6 +102,7 @@ func (ds *dataStore) RegisterForBeta(ctx echo.Context) error {
 func (ds *dataStore) GetAllEmail(ctx echo.Context) error {
 	bz, err := ds.Get([]byte("email"))
 	if err != nil && err != badger.ErrKeyNotFound {
+		ctx.Set(types.HttpEndpointErrorKey, err.Error())
 		return ctx.JSON(http.StatusInternalServerError, echo.Map{
 			"error": "couldn't get them all",
 		})

main.go

@@ -47,6 +47,6 @@ func main() {
 		return
 	}
 
-	router.Register(e, reg, authSvc, localCache)
+	router.Register(cfg, e, reg, authSvc, localCache)
 	log.Fatal().Msgf("error starting server: %s\n", e.Start(cfg.Address()))
 }

registry/v2/blobs.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"net/http"
 
+	"github.com/containerish/OpenRegistry/types"
 	"github.com/fatih/color"
 	"github.com/labstack/echo/v4"
 )
@@ -37,14 +38,15 @@ func (b *blobs) HEAD(ctx echo.Context) error {
 			"skynet": "skynet link not found",
 		}
 		errMsg := b.errorResponse(RegistryErrorCodeManifestBlobUnknown, err.Error(), details)
-		b.fluentbit.Send(errMsg)
+
+		ctx.Set(types.HttpEndpointErrorKey, errMsg)
 		return ctx.JSONBlob(http.StatusNotFound, errMsg)
 	}
 
 	size, ok := b.registry.skynet.Metadata(layerRef.Skylink)
 	if !ok {
 		errMsg := b.errorResponse(RegistryErrorCodeManifestBlobUnknown, "Manifest does not exist", nil)
-		b.fluentbit.Send(errMsg)
+		ctx.Set(types.HttpEndpointErrorKey, errMsg)
 		return ctx.JSONBlob(http.StatusNotFound, errMsg)
 	}
 
@@ -65,7 +67,7 @@ func (b *blobs) UploadBlob(ctx echo.Context) error {
 				"stream upload after first write are not allowed",
 				nil,
 			)
-			b.fluentbit.Send(errMsg)
+			ctx.Set(types.HttpEndpointErrorKey, errMsg)
 			return ctx.JSONBlob(http.StatusBadRequest, errMsg)
 		}
 
@@ -88,13 +90,13 @@ func (b *blobs) UploadBlob(ctx echo.Context) error {
 			"contentRange": contentRange,
 		}
 		errMsg := b.errorResponse(RegistryErrorCodeBlobUploadUnknown, err.Error(), details)
-		b.fluentbit.Send(errMsg)
+		ctx.Set(types.HttpEndpointErrorKey, errMsg)
 		return ctx.JSONBlob(http.StatusRequestedRangeNotSatisfiable, errMsg)
 	}
 
 	if start != len(b.uploads[uuid]) {
 		errMsg := b.errorResponse(RegistryErrorCodeBlobUploadUnknown, "content range mismatch", nil)
-		b.fluentbit.Send(errMsg)
+		ctx.Set(types.HttpEndpointErrorKey, errMsg)
 		return ctx.JSONBlob(http.StatusRequestedRangeNotSatisfiable, errMsg)
 	}
 
@@ -106,7 +108,7 @@ func (b *blobs) UploadBlob(ctx echo.Context) error {
 			"error while creating new buffer from existing blobs",
 			nil,
 		)
-		b.fluentbit.Send(errMsg)
+		ctx.Set(types.HttpEndpointErrorKey, errMsg)
 		return ctx.JSONBlob(http.StatusInternalServerError, errMsg)
 	} // 10
 	ctx.Request().Body.Close()