Add logging middleware for spec endpoints (#1774)

This commit is contained in:
Zachary Wasserman 2018-05-09 11:00:48 -07:00 committed by GitHub
parent 6e6e390346
commit bef7a99160
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 148 additions and 0 deletions

View file

@ -59,3 +59,39 @@ func (mw loggingMiddleware) DeleteLabel(ctx context.Context, name string) error
err = mw.Service.DeleteLabel(ctx, name)
return err
}
func (mw loggingMiddleware) GetLabelSpec(ctx context.Context, name string) (spec *kolide.LabelSpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "GetLabelSpec",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
spec, err = mw.Service.GetLabelSpec(ctx, name)
return spec, err
}
func (mw loggingMiddleware) GetLabelSpecs(ctx context.Context) (specs []*kolide.LabelSpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "GetLabelSpecs",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
specs, err = mw.Service.GetLabelSpecs(ctx)
return specs, err
}
func (mw loggingMiddleware) ApplyLabelSpecs(ctx context.Context, specs []*kolide.LabelSpec) (err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "ApplyLabelSpecs",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
err = mw.Service.ApplyLabelSpecs(ctx, specs)
return err
}

View file

@ -0,0 +1,32 @@
package service
import (
"context"
"time"
"github.com/kolide/fleet/server/kolide"
)
func (mw loggingMiddleware) GetOptionsSpec(ctx context.Context) (spec *kolide.OptionsSpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "GetOptionsSpec",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
spec, err = mw.Service.GetOptionsSpec(ctx)
return spec, err
}
func (mw loggingMiddleware) ApplyOptionsSpec(ctx context.Context, spec *kolide.OptionsSpec) (err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "ApplyOptionsSpec",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
err = mw.Service.ApplyOptionsSpec(ctx, spec)
return err
}

View file

@ -113,3 +113,39 @@ func (mw loggingMiddleware) ListHostsInPack(ctx context.Context, pid uint, opt k
hosts, err = mw.Service.ListHostsInPack(ctx, pid, opt)
return hosts, err
}
func (mw loggingMiddleware) GetPackSpec(ctx context.Context, name string) (spec *kolide.PackSpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "GetPackSpec",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
spec, err = mw.Service.GetPackSpec(ctx, name)
return spec, err
}
func (mw loggingMiddleware) GetPackSpecs(ctx context.Context) (specs []*kolide.PackSpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "GetPackSpecs",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
specs, err = mw.Service.GetPackSpecs(ctx)
return specs, err
}
func (mw loggingMiddleware) ApplyPackSpecs(ctx context.Context, specs []*kolide.PackSpec) (err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "ApplyPackSpecs",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
err = mw.Service.ApplyPackSpecs(ctx, specs)
return err
}

View file

@ -0,0 +1,44 @@
package service
import (
"context"
"time"
"github.com/kolide/fleet/server/kolide"
)
func (mw loggingMiddleware) GetQuerySpec(ctx context.Context, name string) (spec *kolide.QuerySpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "GetQuerySpec",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
spec, err = mw.Service.GetQuerySpec(ctx, name)
return spec, err
}
func (mw loggingMiddleware) GetQuerySpecs(ctx context.Context) (specs []*kolide.QuerySpec, err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "GetQuerySpecs",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
specs, err = mw.Service.GetQuerySpecs(ctx)
return specs, err
}
func (mw loggingMiddleware) ApplyQuerySpecs(ctx context.Context, specs []*kolide.QuerySpec) (err error) {
defer func(begin time.Time) {
mw.logger.Log(
"method", "ApplyQuerySpecs",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
err = mw.Service.ApplyQuerySpecs(ctx, specs)
return err
}