优化结构

internal/integration/storage/reloadable.go

@@ -2,6 +2,7 @@ package storage
 
 import (
 	"context"
+	"errors"
 	"io"
 	"kra/internal/biz/system"
 	"sync"
@@ -31,38 +32,66 @@ func NewReloadable(config *conf.AdminBackend) (*Reloadable, error) {
 }
 
 func (s *Reloadable) Replace(current system.FileStorage) {
+	if s == nil {
+		return
+	}
 	s.mu.Lock()
 	s.current = current
 	s.mu.Unlock()
 }
 
-func (s *Reloadable) Put(ctx context.Context, name string, reader io.Reader) (*system.StoredFile, error) {
+func (s *Reloadable) active() (system.FileStorage, error) {
+	if s == nil {
+		return nil, errors.New("file storage is unavailable")
+	}
 	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.current.Put(ctx, name, reader)
+	current := s.current
+	s.mu.RUnlock()
+	if current == nil {
+		return nil, errors.New("file storage is unavailable")
+	}
+	return current, nil
+}
+
+func (s *Reloadable) Put(ctx context.Context, name string, reader io.Reader) (*system.StoredFile, error) {
+	current, err := s.active()
+	if err != nil {
+		return nil, err
+	}
+	return current.Put(ctx, name, reader)
 }
 func (s *Reloadable) Open(ctx context.Context, name string) (io.ReadCloser, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.current.Open(ctx, name)
+	current, err := s.active()
+	if err != nil {
+		return nil, err
+	}
+	return current.Open(ctx, name)
 }
 func (s *Reloadable) Delete(ctx context.Context, name string) error {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.current.Delete(ctx, name)
+	current, err := s.active()
+	if err != nil {
+		return err
+	}
+	return current.Delete(ctx, name)
 }
 func (s *Reloadable) Compose(ctx context.Context, names []string, destination string) (*system.StoredFile, string, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.current.Compose(ctx, names, destination)
+	current, err := s.active()
+	if err != nil {
+		return nil, "", err
+	}
+	return current.Compose(ctx, names, destination)
 }
 func (s *Reloadable) DeletePrefix(ctx context.Context, prefix string) error {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.current.DeletePrefix(ctx, prefix)
+	current, err := s.active()
+	if err != nil {
+		return err
+	}
+	return current.DeletePrefix(ctx, prefix)
 }
 func (s *Reloadable) List(ctx context.Context, prefix, cursor string, limit int) ([]*system.StoredFile, string, bool, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return s.current.List(ctx, prefix, cursor, limit)
+	current, err := s.active()
+	if err != nil {
+		return nil, "", false, err
+	}
+	return current.List(ctx, prefix, cursor, limit)
 }