From 098dbe6ff4f59652181c8e0e3873fbfcf0e65ea3 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Tue, 19 Jul 2022 09:47:55 +0100 Subject: [chore] use our own logging implementation (#716) * first commit Signed-off-by: kim * replace logging with our own log library Signed-off-by: kim * fix imports Signed-off-by: kim * fix log imports Signed-off-by: kim * add license text Signed-off-by: kim * fix package import cycle between config and log package Signed-off-by: kim * fix empty kv.Fields{} being passed to WithFields() Signed-off-by: kim * fix uses of log.WithFields() with whitespace issues and empty slices Signed-off-by: kim * *linter related grumbling* Signed-off-by: kim * gofmt the codebase! also fix more log.WithFields() formatting issues Signed-off-by: kim * update testrig code to match new changes Signed-off-by: kim * fix error wrapping in non fmt.Errorf function Signed-off-by: kim * add benchmarking of log.Caller() vs non-cached Signed-off-by: kim * fix syslog tests, add standard build tags to test runner to ensure consistency Signed-off-by: kim * make syslog tests more robust Signed-off-by: kim * fix caller depth arithmatic (is that how you spell it?) Signed-off-by: kim * update to use unkeyed fields in kv.Field{} instances Signed-off-by: kim * update go-kv library Signed-off-by: kim * update libraries list Signed-off-by: kim * fuck you linter get nerfed Signed-off-by: kim Co-authored-by: tobi <31960611+tsmethurst@users.noreply.github.com> --- internal/storage/local.go | 5 +++++ internal/storage/s3.go | 5 +++++ internal/storage/storage.go | 4 +--- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'internal/storage') diff --git a/internal/storage/local.go b/internal/storage/local.go index da57631f9..8ed3ca8d8 100644 --- a/internal/storage/local.go +++ b/internal/storage/local.go @@ -33,18 +33,23 @@ type Local struct { func (l *Local) Get(ctx context.Context, key string) ([]byte, error) { return l.KVStore.Get(key) } + func (l *Local) GetStream(ctx context.Context, key string) (io.ReadCloser, error) { return l.KVStore.GetStream(key) } + func (l *Local) PutStream(ctx context.Context, key string, r io.Reader) error { return l.KVStore.PutStream(key, r) } + func (l *Local) Put(ctx context.Context, key string, value []byte) error { return l.KVStore.Put(key, value) } + func (l *Local) Delete(ctx context.Context, key string) error { return l.KVStore.Delete(key) } + func (l *Local) URL(ctx context.Context, key string) *url.URL { return nil } diff --git a/internal/storage/s3.go b/internal/storage/s3.go index a15114488..ee51bea89 100644 --- a/internal/storage/s3.go +++ b/internal/storage/s3.go @@ -55,6 +55,7 @@ func (s *S3) Get(ctx context.Context, key string) ([]byte, error) { } return b, nil } + func (s *S3) GetStream(ctx context.Context, key string) (io.ReadCloser, error) { o, err := s.mc.GetObject(ctx, s.bucket, key, minio.GetObjectOptions{}) if err != nil { @@ -62,21 +63,25 @@ func (s *S3) GetStream(ctx context.Context, key string) (io.ReadCloser, error) { } return o, err } + func (s *S3) PutStream(ctx context.Context, key string, r io.Reader) error { if _, err := s.mc.PutObject(ctx, s.bucket, key, r, -1, minio.PutObjectOptions{}); err != nil { return fmt.Errorf("uploading data stream: %w", err) } return nil } + func (s *S3) Put(ctx context.Context, key string, value []byte) error { if _, err := s.mc.PutObject(ctx, s.bucket, key, bytes.NewBuffer(value), -1, minio.PutObjectOptions{}); err != nil { return fmt.Errorf("uploading data slice: %w", err) } return nil } + func (s *S3) Delete(ctx context.Context, key string) error { return s.mc.RemoveObject(ctx, s.bucket, key, minio.RemoveObjectOptions{}) } + func (s *S3) URL(ctx context.Context, key string) *url.URL { // it's safe to ignore the error here, as we just fall back to fetching the // file if the url request fails diff --git a/internal/storage/storage.go b/internal/storage/storage.go index 88577442f..7a4ebc6c3 100644 --- a/internal/storage/storage.go +++ b/internal/storage/storage.go @@ -33,9 +33,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/config" ) -var ( - ErrNotSupported = errors.New("driver does not suppport functionality") -) +var ErrNotSupported = errors.New("driver does not suppport functionality") // Driver implements the functionality to store and retrieve blobs // (images,video,audio) -- cgit v1.2.3