Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make caching include error states and simplify assertions (#191)

Browse source
This commit is contained in:
andig 2020-06-12 21:16:06 +02:00 • committed by GitHub
parent dc6da4416f
commit fade1d5ce2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

67
provider/cache.go
View file

@ -15,6 +15,7 @@ type Cached struct {
cache time.Duration
getter interface{}
val interface{}
err error
}
// NewCached wraps a getter with a cache
@ -29,102 +30,68 @@ func NewCached(log *util.Logger, getter interface{}, cache time.Duration) *Cache
// FloatGetter gets float value
func (c *Cached) FloatGetter() FloatGetter {
g, ok := c.getter.(FloatGetter)
g, ok := c.getter.(func() (float64, error))
if !ok {
if g, ok = c.getter.(func() (float64, error)); !ok {
c.log.FATAL.Fatalf("invalid type: %T", c.getter)
}
g = FloatGetter(g)
c.log.FATAL.Fatalf("invalid type: %T", c.getter)
}
return FloatGetter(func() (float64, error) {
if c.clock.Since(c.updated) > c.cache {
val, err := g()
if err != nil {
return val, err
}
c.val, c.err = g()
c.updated = c.clock.Now()
c.val = val
}
return c.val.(float64), nil
return c.val.(float64), c.err
})
}
// IntGetter gets int value
func (c *Cached) IntGetter() IntGetter {
g, ok := c.getter.(IntGetter)
g, ok := c.getter.(func() (int64, error))
if !ok {
if g, ok = c.getter.(func() (int64, error)); !ok {
c.log.FATAL.Fatalf("invalid type: %T", c.getter)
}
g = IntGetter(g)
c.log.FATAL.Fatalf("invalid type: %T", c.getter)
}
return IntGetter(func() (int64, error) {
if c.clock.Since(c.updated) > c.cache {
val, err := g()
if err != nil {
return val, err
}
c.val, c.err = g()
c.updated = c.clock.Now()
c.val = val
}
return c.val.(int64), nil
return c.val.(int64), c.err
})
}
// StringGetter gets string value
func (c *Cached) StringGetter() StringGetter {
g, ok := c.getter.(StringGetter)
g, ok := c.getter.(func() (string, error))
if !ok {
if g, ok = c.getter.(func() (string, error)); !ok {
c.log.FATAL.Fatalf("invalid type: %T", c.getter)
}
g = StringGetter(g)
c.log.FATAL.Fatalf("invalid type: %T", c.getter)
}
return StringGetter(func() (string, error) {
if c.clock.Since(c.updated) > c.cache {
val, err := g()
if err != nil {
return val, err
}
c.val, c.err = g()
c.updated = c.clock.Now()
c.val = val
}
return c.val.(string), nil
return c.val.(string), c.err
})
}
// BoolGetter gets bool value
func (c *Cached) BoolGetter() BoolGetter {
g, ok := c.getter.(BoolGetter)
g, ok := c.getter.(func() (bool, error))
if !ok {
if g, ok = c.getter.(func() (bool, error)); !ok {
c.log.FATAL.Fatalf("invalid type: %T", g)
}
g = BoolGetter(g)
c.log.FATAL.Fatalf("invalid type: %T", g)
}
return BoolGetter(func() (bool, error) {
if c.clock.Since(c.updated) > c.cache {
val, err := g()
if err != nil {
return val, err
}
c.val, c.err = g()
c.updated = c.clock.Now()
c.val = val
}
return c.val.(bool), nil
return c.val.(bool), c.err
})
}