Compare commits

...

5 Commits

Author SHA1 Message Date
ed5d30a58e store/noop: fixup Exists
Some checks failed
coverage / build (push) Has been cancelled
test / test (push) Has been cancelled
sync / sync (push) Has been cancelled
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-05-29 12:43:39 +03:00
vtolstov
b4b67a8b41 Apply Code Coverage Badge 2025-05-25 02:41:23 +00:00
13f90ff716 changed embedded mutex to private field (#217)
Some checks failed
sync / sync (push) Failing after 16m12s
test / test (push) Failing after 17m28s
coverage / build (push) Failing after 17m40s
2025-05-25 01:15:03 +03:00
0f8f12aee0 add tracer enabled status
Some checks failed
coverage / build (push) Successful in 2m52s
test / test (push) Failing after 18m53s
sync / sync (push) Successful in 26s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-05-19 09:33:01 +03:00
8b406cf963 util/buffer: add Reset() method
Some checks failed
coverage / build (push) Failing after 1m36s
test / test (push) Successful in 3m35s
sync / sync (push) Successful in 7s
closes #402

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-05-12 19:18:45 +03:00
20 changed files with 180 additions and 153 deletions

View File

@@ -1,5 +1,5 @@
# Micro
![Coverage](https://img.shields.io/badge/Coverage-33.7%25-yellow)
![Coverage](https://img.shields.io/badge/Coverage-33.6%25-yellow)
[![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Doc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/go.unistack.org/micro/v4?tab=overview)
[![Status](https://git.unistack.org/unistack-org/micro/actions/workflows/job_tests.yml/badge.svg?branch=v4)](https://git.unistack.org/unistack-org/micro/actions?query=workflow%3Abuild+branch%3Av4+event%3Apush)

View File

@@ -22,8 +22,8 @@ type Broker struct {
subscribers map[string][]*Subscriber
addr string
opts broker.Options
sync.RWMutex
connected bool
mu sync.RWMutex
connected bool
}
type memoryMessage struct {
@@ -72,9 +72,9 @@ func (b *Broker) newCodec(ct string) (codec.Codec, error) {
if idx := strings.IndexRune(ct, ';'); idx >= 0 {
ct = ct[:idx]
}
b.RLock()
b.mu.RLock()
c, ok := b.opts.Codecs[ct]
b.RUnlock()
b.mu.RUnlock()
if ok {
return c, nil
}
@@ -96,8 +96,8 @@ func (b *Broker) Connect(ctx context.Context) error {
default:
}
b.Lock()
defer b.Unlock()
b.mu.Lock()
defer b.mu.Unlock()
if b.connected {
return nil
@@ -126,8 +126,8 @@ func (b *Broker) Disconnect(ctx context.Context) error {
default:
}
b.Lock()
defer b.Unlock()
b.mu.Lock()
defer b.mu.Unlock()
if !b.connected {
return nil
@@ -183,12 +183,12 @@ func (b *Broker) fnPublish(ctx context.Context, topic string, messages ...broker
}
func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.Message) error {
b.RLock()
b.mu.RLock()
if !b.connected {
b.RUnlock()
b.mu.RUnlock()
return broker.ErrNotConnected
}
b.RUnlock()
b.mu.RUnlock()
select {
case <-ctx.Done():
@@ -196,9 +196,9 @@ func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.M
default:
}
b.RLock()
b.mu.RLock()
subs, ok := b.subscribers[topic]
b.RUnlock()
b.mu.RUnlock()
if !ok {
return nil
}
@@ -255,12 +255,12 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
return nil, err
}
b.RLock()
b.mu.RLock()
if !b.connected {
b.RUnlock()
b.mu.RUnlock()
return nil, broker.ErrNotConnected
}
b.RUnlock()
b.mu.RUnlock()
sid, err := id.New()
if err != nil {
@@ -278,13 +278,13 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
ctx: ctx,
}
b.Lock()
b.mu.Lock()
b.subscribers[topic] = append(b.subscribers[topic], sub)
b.Unlock()
b.mu.Unlock()
go func() {
<-sub.exit
b.Lock()
b.mu.Lock()
newSubscribers := make([]*Subscriber, 0, len(b.subscribers)-1)
for _, sb := range b.subscribers[topic] {
if sb.id == sub.id {
@@ -293,7 +293,7 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
newSubscribers = append(newSubscribers, sb)
}
b.subscribers[topic] = newSubscribers
b.Unlock()
b.mu.Unlock()
}()
return sub, nil

View File

@@ -14,16 +14,16 @@ type NoopBroker struct {
funcPublish FuncPublish
funcSubscribe FuncSubscribe
opts Options
sync.RWMutex
mu sync.RWMutex
}
func (b *NoopBroker) newCodec(ct string) (codec.Codec, error) {
if idx := strings.IndexRune(ct, ';'); idx >= 0 {
ct = ct[:idx]
}
b.RLock()
b.mu.RLock()
c, ok := b.opts.Codecs[ct]
b.RUnlock()
b.mu.RUnlock()
if ok {
return c, nil
}

View File

@@ -11,8 +11,8 @@ import (
)
type httpProfile struct {
server *http.Server
sync.Mutex
server *http.Server
mu sync.Mutex
running bool
}
@@ -21,8 +21,8 @@ var DefaultAddress = ":6060"
// Start the profiler
func (h *httpProfile) Start() error {
h.Lock()
defer h.Unlock()
h.mu.Lock()
defer h.mu.Unlock()
if h.running {
return nil
@@ -30,9 +30,9 @@ func (h *httpProfile) Start() error {
go func() {
if err := h.server.ListenAndServe(); err != nil {
h.Lock()
h.mu.Lock()
h.running = false
h.Unlock()
h.mu.Unlock()
}
}()
@@ -43,8 +43,8 @@ func (h *httpProfile) Start() error {
// Stop the profiler
func (h *httpProfile) Stop() error {
h.Lock()
defer h.Unlock()
h.mu.Lock()
defer h.mu.Unlock()
if !h.running {
return nil

View File

@@ -17,7 +17,7 @@ type profiler struct {
cpuFile *os.File
memFile *os.File
opts profile.Options
sync.Mutex
mu sync.Mutex
running bool
}
@@ -39,8 +39,8 @@ func (p *profiler) writeHeap(f *os.File) {
}
func (p *profiler) Start() error {
p.Lock()
defer p.Unlock()
p.mu.Lock()
defer p.mu.Unlock()
if p.running {
return nil
@@ -86,8 +86,8 @@ func (p *profiler) Start() error {
}
func (p *profiler) Stop() error {
p.Lock()
defer p.Unlock()
p.mu.Lock()
defer p.mu.Unlock()
select {
case <-p.exit:

View File

@@ -33,7 +33,7 @@ type memory struct {
records map[string]services
watchers map[string]*watcher
opts register.Options
sync.RWMutex
mu sync.RWMutex
}
// services is a KV map with service name as the key and a map of records as the value
@@ -57,7 +57,7 @@ func (m *memory) ttlPrune() {
defer prune.Stop()
for range prune.C {
m.Lock()
m.mu.Lock()
for namespace, services := range m.records {
for service, versions := range services {
for version, record := range versions {
@@ -72,24 +72,24 @@ func (m *memory) ttlPrune() {
}
}
}
m.Unlock()
m.mu.Unlock()
}
}
func (m *memory) sendEvent(r *register.Result) {
m.RLock()
m.mu.RLock()
watchers := make([]*watcher, 0, len(m.watchers))
for _, w := range m.watchers {
watchers = append(watchers, w)
}
m.RUnlock()
m.mu.RUnlock()
for _, w := range watchers {
select {
case <-w.exit:
m.Lock()
m.mu.Lock()
delete(m.watchers, w.id)
m.Unlock()
m.mu.Unlock()
default:
select {
case w.res <- r:
@@ -113,8 +113,8 @@ func (m *memory) Init(opts ...register.Option) error {
}
// add services
m.Lock()
defer m.Unlock()
m.mu.Lock()
defer m.mu.Unlock()
return nil
}
@@ -124,8 +124,8 @@ func (m *memory) Options() register.Options {
}
func (m *memory) Register(_ context.Context, s *register.Service, opts ...register.RegisterOption) error {
m.Lock()
defer m.Unlock()
m.mu.Lock()
defer m.mu.Unlock()
options := register.NewRegisterOptions(opts...)
@@ -197,8 +197,8 @@ func (m *memory) Register(_ context.Context, s *register.Service, opts ...regist
}
func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...register.DeregisterOption) error {
m.Lock()
defer m.Unlock()
m.mu.Lock()
defer m.mu.Unlock()
options := register.NewDeregisterOptions(opts...)
@@ -264,9 +264,9 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
// if it's a wildcard domain, return from all domains
if options.Namespace == register.WildcardNamespace {
m.RLock()
m.mu.RLock()
recs := m.records
m.RUnlock()
m.mu.RUnlock()
var services []*register.Service
@@ -286,8 +286,8 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
return services, nil
}
m.RLock()
defer m.RUnlock()
m.mu.RLock()
defer m.mu.RUnlock()
// check the domain exists
services, ok := m.records[options.Namespace]
@@ -319,9 +319,9 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
// if it's a wildcard domain, list from all domains
if options.Namespace == register.WildcardNamespace {
m.RLock()
m.mu.RLock()
recs := m.records
m.RUnlock()
m.mu.RUnlock()
var services []*register.Service
@@ -336,8 +336,8 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
return services, nil
}
m.RLock()
defer m.RUnlock()
m.mu.RLock()
defer m.mu.RUnlock()
// ensure the domain exists
services, ok := m.records[options.Namespace]
@@ -371,9 +371,9 @@ func (m *memory) Watch(ctx context.Context, opts ...register.WatchOption) (regis
wo: wo,
}
m.Lock()
m.mu.Lock()
m.watchers[w.id] = w
m.Unlock()
m.mu.Unlock()
return w, nil
}

View File

@@ -51,13 +51,13 @@ func (r *rpcHandler) Options() HandlerOptions {
}
type noopServer struct {
h Handler
wg *sync.WaitGroup
rsvc *register.Service
handlers map[string]Handler
exit chan chan error
opts Options
sync.RWMutex
h Handler
wg *sync.WaitGroup
rsvc *register.Service
handlers map[string]Handler
exit chan chan error
opts Options
mu sync.RWMutex
registered bool
started bool
}
@@ -125,10 +125,10 @@ func (n *noopServer) String() string {
//nolint:gocyclo
func (n *noopServer) Register() error {
n.RLock()
n.mu.RLock()
rsvc := n.rsvc
config := n.opts
n.RUnlock()
n.mu.RUnlock()
// if service already filled, reuse it and return early
if rsvc != nil {
@@ -144,9 +144,9 @@ func (n *noopServer) Register() error {
return err
}
n.RLock()
n.mu.RLock()
registered := n.registered
n.RUnlock()
n.mu.RUnlock()
if !registered {
if config.Logger.V(logger.InfoLevel) {
@@ -164,8 +164,8 @@ func (n *noopServer) Register() error {
return nil
}
n.Lock()
defer n.Unlock()
n.mu.Lock()
defer n.mu.Unlock()
n.registered = true
if cacheService {
@@ -178,9 +178,9 @@ func (n *noopServer) Register() error {
func (n *noopServer) Deregister() error {
var err error
n.RLock()
n.mu.RLock()
config := n.opts
n.RUnlock()
n.mu.RUnlock()
service, err := NewRegisterService(n)
if err != nil {
@@ -195,29 +195,29 @@ func (n *noopServer) Deregister() error {
return err
}
n.Lock()
n.mu.Lock()
n.rsvc = nil
if !n.registered {
n.Unlock()
n.mu.Unlock()
return nil
}
n.registered = false
n.Unlock()
n.mu.Unlock()
return nil
}
//nolint:gocyclo
func (n *noopServer) Start() error {
n.RLock()
n.mu.RLock()
if n.started {
n.RUnlock()
n.mu.RUnlock()
return nil
}
config := n.Options()
n.RUnlock()
n.mu.RUnlock()
// use 127.0.0.1 to avoid scan of all network interfaces
addr, err := maddr.Extract("127.0.0.1")
@@ -235,11 +235,11 @@ func (n *noopServer) Start() error {
config.Logger.Info(n.opts.Context, "server [noop] Listening on "+config.Address)
}
n.Lock()
n.mu.Lock()
if len(config.Advertise) == 0 {
config.Advertise = config.Address
}
n.Unlock()
n.mu.Unlock()
// use RegisterCheck func before register
// nolint: nestif
@@ -273,9 +273,9 @@ func (n *noopServer) Start() error {
select {
// register self on interval
case <-t.C:
n.RLock()
n.mu.RLock()
registered := n.registered
n.RUnlock()
n.mu.RUnlock()
rerr := config.RegisterCheck(config.Context)
// nolint: nestif
if rerr != nil && registered {
@@ -332,29 +332,29 @@ func (n *noopServer) Start() error {
}()
// mark the server as started
n.Lock()
n.mu.Lock()
n.started = true
n.Unlock()
n.mu.Unlock()
return nil
}
func (n *noopServer) Stop() error {
n.RLock()
n.mu.RLock()
if !n.started {
n.RUnlock()
n.mu.RUnlock()
return nil
}
n.RUnlock()
n.mu.RUnlock()
ch := make(chan error)
n.exit <- ch
err := <-ch
n.Lock()
n.mu.Lock()
n.rsvc = nil
n.started = false
n.Unlock()
n.mu.Unlock()
return err
}

View File

@@ -96,9 +96,9 @@ func RegisterHandler(s server.Server, h interface{}, opts ...server.HandlerOptio
}
type service struct {
done chan struct{}
opts Options
sync.RWMutex
done chan struct{}
opts Options
mu sync.RWMutex
stopped bool
}
@@ -321,9 +321,9 @@ func (s *service) Health() bool {
func (s *service) Start() error {
var err error
s.RLock()
s.mu.RLock()
config := s.opts
s.RUnlock()
s.mu.RUnlock()
for _, cfg := range s.opts.Configs {
if cfg.Options().Struct == nil {
@@ -380,9 +380,9 @@ func (s *service) Start() error {
}
func (s *service) Stop() error {
s.RLock()
s.mu.RLock()
config := s.opts
s.RUnlock()
s.mu.RUnlock()
if config.Loggers[0].V(logger.InfoLevel) {
config.Loggers[0].Info(s.opts.Context, fmt.Sprintf("stoppping [service] %s", s.Name()))
@@ -457,13 +457,13 @@ func (s *service) Run() error {
// notifyShutdown marks the service as stopped and closes the done channel.
// It ensures the channel is closed only once, preventing multiple closures.
func (s *service) notifyShutdown() {
s.Lock()
s.mu.Lock()
if s.stopped {
s.Unlock()
s.mu.Unlock()
return
}
s.stopped = true
s.Unlock()
s.mu.Unlock()
close(s.done)
}

View File

@@ -6,6 +6,7 @@ import (
"sync/atomic"
"go.unistack.org/micro/v4/options"
"go.unistack.org/micro/v4/store"
"go.unistack.org/micro/v4/util/id"
)
@@ -139,7 +140,7 @@ func (n *noopStore) fnExists(ctx context.Context, _ string, _ ...ExistsOption) e
return ctx.Err()
default:
}
return nil
return store.ErrNotFound
}
func (n *noopStore) Write(ctx context.Context, key string, val interface{}, opts ...WriteOption) error {

View File

@@ -9,7 +9,7 @@ type memorySync struct {
locks map[string]*memoryLock
options Options
mtx gosync.RWMutex
mu gosync.RWMutex
}
type memoryLock struct {
@@ -74,7 +74,7 @@ func (m *memorySync) Options() Options {
func (m *memorySync) Lock(id string, opts ...LockOption) error {
// lock our access
m.mtx.Lock()
m.mu.Lock()
var options LockOptions
for _, o := range opts {
@@ -90,11 +90,11 @@ func (m *memorySync) Lock(id string, opts ...LockOption) error {
release: make(chan bool),
}
// unlock
m.mtx.Unlock()
m.mu.Unlock()
return nil
}
m.mtx.Unlock()
m.mu.Unlock()
// set wait time
var wait <-chan time.Time
@@ -124,12 +124,12 @@ lockLoop:
// wait for the lock to be released
select {
case <-lk.release:
m.mtx.Lock()
m.mu.Lock()
// someone locked before us
lk, ok = m.locks[id]
if ok {
m.mtx.Unlock()
m.mu.Unlock()
continue
}
@@ -141,7 +141,7 @@ lockLoop:
release: make(chan bool),
}
m.mtx.Unlock()
m.mu.Unlock()
break lockLoop
case <-ttl:
@@ -160,8 +160,8 @@ lockLoop:
}
func (m *memorySync) Unlock(id string) error {
m.mtx.Lock()
defer m.mtx.Unlock()
m.mu.Lock()
defer m.mu.Unlock()
lk, ok := m.locks[id]
// no lock exists

View File

@@ -46,6 +46,10 @@ func (s memoryStringer) String() string {
return s.s
}
func (t *Tracer) Enabled() bool {
return t.opts.Enabled
}
func (t *Tracer) Flush(_ context.Context) error {
return nil
}

View File

@@ -20,6 +20,10 @@ func (t *noopTracer) Spans() []Span {
var uuidNil = uuid.Nil.String()
func (t *noopTracer) Enabled() bool {
return t.opts.Enabled
}
func (t *noopTracer) Start(ctx context.Context, name string, opts ...SpanOption) (context.Context, Span) {
options := NewSpanOptions(opts...)
span := &noopSpan{

View File

@@ -142,6 +142,8 @@ type Options struct {
Name string
// ContextAttrFuncs contains funcs that provides tracing
ContextAttrFuncs []ContextAttrFunc
// Enabled specify trace status
Enabled bool
}
// Option func signature
@@ -181,6 +183,7 @@ func NewOptions(opts ...Option) Options {
Logger: logger.DefaultLogger,
Context: context.Background(),
ContextAttrFuncs: DefaultContextAttrFuncs,
Enabled: true,
}
for _, o := range opts {
o(&options)
@@ -194,3 +197,10 @@ func Name(n string) Option {
o.Name = n
}
}
// Disabled disable tracer
func Disabled(b bool) Option {
return func(o *Options) {
o.Enabled = !b
}
}

View File

@@ -51,6 +51,8 @@ type Tracer interface {
// Extract(ctx context.Context)
// Flush flushes spans
Flush(ctx context.Context) error
// Enabled returns tracer status
Enabled() bool
}
type Span interface {

View File

@@ -67,6 +67,12 @@ func (b *SeekerBuffer) Close() error {
return nil
}
// Reset clears all the data out of the buffer and sets the read position to 0.
func (b *SeekerBuffer) Reset() {
b.data = nil
b.pos = 0
}
// Len returns the length of data remaining to be read.
func (b *SeekerBuffer) Len() int {
return len(b.data[b.pos:])

View File

@@ -137,7 +137,7 @@ type cache struct {
opts Options
sync.RWMutex
mu sync.RWMutex
}
type cacheEntry struct {
@@ -171,7 +171,7 @@ func (c *cache) put(req string, res string) {
ttl = c.opts.MaxCacheTTL
}
c.Lock()
c.mu.Lock()
if c.entries == nil {
c.entries = make(map[string]cacheEntry)
}
@@ -207,7 +207,7 @@ func (c *cache) put(req string, res string) {
}
c.opts.Meter.Counter(semconv.CacheItemsTotal, "type", "dns").Inc()
c.Unlock()
c.mu.Unlock()
}
func (c *cache) get(req string) (res string) {
@@ -219,8 +219,8 @@ func (c *cache) get(req string) (res string) {
return ""
}
c.RLock()
defer c.RUnlock()
c.mu.RLock()
defer c.mu.RUnlock()
if c.entries == nil {
return ""

View File

@@ -20,7 +20,7 @@ type dnsConn struct {
ibuf bytes.Buffer
obuf bytes.Buffer
sync.Mutex
mu sync.Mutex
}
type roundTripper func(ctx context.Context, req string) (res string, err error)
@@ -42,15 +42,15 @@ func (c *dnsConn) Read(b []byte) (n int, err error) {
}
func (c *dnsConn) Write(b []byte) (n int, err error) {
c.Lock()
defer c.Unlock()
c.mu.Lock()
defer c.mu.Unlock()
return c.ibuf.Write(b)
}
func (c *dnsConn) Close() error {
c.Lock()
c.mu.Lock()
cancel := c.cancel
c.Unlock()
c.mu.Unlock()
if cancel != nil {
cancel()
@@ -78,9 +78,9 @@ func (c *dnsConn) SetDeadline(t time.Time) error {
}
func (c *dnsConn) SetReadDeadline(t time.Time) error {
c.Lock()
c.mu.Lock()
c.deadline = t
c.Unlock()
c.mu.Unlock()
return nil
}
@@ -90,8 +90,8 @@ func (c *dnsConn) SetWriteDeadline(_ time.Time) error {
}
func (c *dnsConn) drainBuffers(b []byte) (string, int, error) {
c.Lock()
defer c.Unlock()
c.mu.Lock()
defer c.mu.Unlock()
// drain the output buffer
if c.obuf.Len() > 0 {
@@ -119,8 +119,8 @@ func (c *dnsConn) drainBuffers(b []byte) (string, int, error) {
}
func (c *dnsConn) fillBuffer(b []byte, str string) (int, error) {
c.Lock()
defer c.Unlock()
c.mu.Lock()
defer c.mu.Unlock()
c.obuf.WriteByte(byte(len(str) >> 8))
c.obuf.WriteByte(byte(len(str)))
c.obuf.WriteString(str)
@@ -128,8 +128,8 @@ func (c *dnsConn) fillBuffer(b []byte, str string) (int, error) {
}
func (c *dnsConn) childContext() (context.Context, context.CancelFunc) {
c.Lock()
defer c.Unlock()
c.mu.Lock()
defer c.mu.Unlock()
if c.ctx == nil {
c.ctx, c.cancel = context.WithCancel(context.Background())
}

View File

@@ -52,7 +52,7 @@ type clientTracer struct {
tr tracer.Tracer
activeHooks map[string]context.Context
root tracer.Span
mtx sync.Mutex
mu sync.Mutex
}
func NewClientTrace(ctx context.Context, tr tracer.Tracer) *httptrace.ClientTrace {
@@ -83,8 +83,8 @@ func NewClientTrace(ctx context.Context, tr tracer.Tracer) *httptrace.ClientTrac
}
func (ct *clientTracer) start(hook, spanName string, attrs ...interface{}) {
ct.mtx.Lock()
defer ct.mtx.Unlock()
ct.mu.Lock()
defer ct.mu.Unlock()
if hookCtx, found := ct.activeHooks[hook]; !found {
var sp tracer.Span
@@ -104,8 +104,8 @@ func (ct *clientTracer) start(hook, spanName string, attrs ...interface{}) {
}
func (ct *clientTracer) end(hook string, err error, attrs ...interface{}) {
ct.mtx.Lock()
defer ct.mtx.Unlock()
ct.mu.Lock()
defer ct.mu.Unlock()
if ctx, ok := ct.activeHooks[hook]; ok { // nolint:nestif
if span, ok := tracer.SpanFromContext(ctx); ok {
if err != nil {
@@ -136,8 +136,8 @@ func (ct *clientTracer) getParentContext(hook string) context.Context {
}
func (ct *clientTracer) span(hook string) (tracer.Span, bool) {
ct.mtx.Lock()
defer ct.mtx.Unlock()
ct.mu.Lock()
defer ct.mu.Unlock()
if ctx, ok := ct.activeHooks[hook]; ok {
return tracer.SpanFromContext(ctx)
}

View File

@@ -14,7 +14,7 @@ type Buffer struct {
vals []*Entry
size int
sync.RWMutex
mu sync.RWMutex
}
// Entry is ring buffer data entry
@@ -35,8 +35,8 @@ type Stream struct {
// Put adds a new value to ring buffer
func (b *Buffer) Put(v interface{}) {
b.Lock()
defer b.Unlock()
b.mu.Lock()
defer b.mu.Unlock()
// append to values
entry := &Entry{
@@ -63,8 +63,8 @@ func (b *Buffer) Put(v interface{}) {
// Get returns the last n entries
func (b *Buffer) Get(n int) []*Entry {
b.RLock()
defer b.RUnlock()
b.mu.RLock()
defer b.mu.RUnlock()
// reset any invalid values
if n > len(b.vals) || n < 0 {
@@ -80,8 +80,8 @@ func (b *Buffer) Get(n int) []*Entry {
// Since returns the entries since a specific time
func (b *Buffer) Since(t time.Time) []*Entry {
b.RLock()
defer b.RUnlock()
b.mu.RLock()
defer b.mu.RUnlock()
// return all the values
if t.IsZero() {
@@ -109,8 +109,8 @@ func (b *Buffer) Since(t time.Time) []*Entry {
// Stream logs from the buffer
// Close the channel when you want to stop
func (b *Buffer) Stream() (<-chan *Entry, chan bool) {
b.Lock()
defer b.Unlock()
b.mu.Lock()
defer b.mu.Unlock()
entries := make(chan *Entry, 128)
id := id.MustNew()

View File

@@ -24,7 +24,7 @@ type stream struct {
err error
request *request
sync.RWMutex
mu sync.RWMutex
}
type request struct {
@@ -57,9 +57,9 @@ func (s *stream) Request() server.Request {
func (s *stream) Send(v interface{}) error {
err := s.Stream.SendMsg(v)
if err != nil {
s.Lock()
s.mu.Lock()
s.err = err
s.Unlock()
s.mu.Unlock()
}
return err
}
@@ -68,17 +68,17 @@ func (s *stream) Send(v interface{}) error {
func (s *stream) Recv(v interface{}) error {
err := s.Stream.RecvMsg(v)
if err != nil {
s.Lock()
s.mu.Lock()
s.err = err
s.Unlock()
s.mu.Unlock()
}
return err
}
// Error returns error that stream holds
func (s *stream) Error() error {
s.RLock()
defer s.RUnlock()
s.mu.RLock()
defer s.mu.RUnlock()
return s.err
}