2018-04-19 13:40:22 +02:00
|
|
|
// +build !test
|
|
|
|
|
2017-09-23 01:03:27 +02:00
|
|
|
package api
|
|
|
|
|
|
|
|
import (
|
2018-04-04 10:15:23 +02:00
|
|
|
"fmt"
|
2017-09-23 01:03:27 +02:00
|
|
|
"time"
|
|
|
|
|
2018-05-10 23:53:25 +02:00
|
|
|
"github.com/mainflux/mainflux/clients"
|
2018-04-04 10:15:23 +02:00
|
|
|
log "github.com/mainflux/mainflux/logger"
|
2017-09-23 01:03:27 +02:00
|
|
|
)
|
|
|
|
|
2018-05-10 23:53:25 +02:00
|
|
|
var _ clients.Service = (*loggingMiddleware)(nil)
|
2017-09-23 01:03:27 +02:00
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
type loggingMiddleware struct {
|
2017-09-23 01:03:27 +02:00
|
|
|
logger log.Logger
|
2018-05-10 23:53:25 +02:00
|
|
|
svc clients.Service
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
// LoggingMiddleware adds logging facilities to the core service.
|
2018-05-10 23:53:25 +02:00
|
|
|
func LoggingMiddleware(svc clients.Service, logger log.Logger) clients.Service {
|
2018-03-11 18:06:01 +01:00
|
|
|
return &loggingMiddleware{logger, svc}
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-05-10 23:53:25 +02:00
|
|
|
func (lm *loggingMiddleware) AddClient(key string, client clients.Client) (id string, err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method add_client for key %s and client %s took %s to complete", key, id, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
return lm.svc.AddClient(key, client)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-05-10 23:53:25 +02:00
|
|
|
func (lm *loggingMiddleware) UpdateClient(key string, client clients.Client) (err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method update_client for key %s and client %s took %s to complete", key, client.ID, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
return lm.svc.UpdateClient(key, client)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-05-10 23:53:25 +02:00
|
|
|
func (lm *loggingMiddleware) ViewClient(key string, id string) (client clients.Client, err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method view_client for key %s and client %s took %s to complete", key, id, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
return lm.svc.ViewClient(key, id)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-05-10 23:53:25 +02:00
|
|
|
func (lm *loggingMiddleware) ListClients(key string, offset, limit int) (clients []clients.Client, err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method list_clients for key %s took %s to complete", key, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-04-18 22:36:24 +02:00
|
|
|
return lm.svc.ListClients(key, offset, limit)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
func (lm *loggingMiddleware) RemoveClient(key string, id string) (err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method remove_client for key %s and client %s took %s to complete", key, id, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
return lm.svc.RemoveClient(key, id)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-05-10 23:53:25 +02:00
|
|
|
func (lm *loggingMiddleware) CreateChannel(key string, channel clients.Channel) (id string, err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method create_channel for key %s and channel %s took %s to complete", key, id, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
return lm.svc.CreateChannel(key, channel)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-05-10 23:53:25 +02:00
|
|
|
func (lm *loggingMiddleware) UpdateChannel(key string, channel clients.Channel) (err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method update_channel for key %s and channel %s took %s to complete", key, channel.ID, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
return lm.svc.UpdateChannel(key, channel)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-05-10 23:53:25 +02:00
|
|
|
func (lm *loggingMiddleware) ViewChannel(key string, id string) (channel clients.Channel, err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method view_channel for key %s and channel %s took %s to complete", key, id, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
return lm.svc.ViewChannel(key, id)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-05-10 23:53:25 +02:00
|
|
|
func (lm *loggingMiddleware) ListChannels(key string, offset, limit int) (channels []clients.Channel, err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method list_channels for key %s took %s to complete", key, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-04-18 22:36:24 +02:00
|
|
|
return lm.svc.ListChannels(key, offset, limit)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
func (lm *loggingMiddleware) RemoveChannel(key string, id string) (err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method remove_channel for key %s and channel %s took %s to complete", key, id, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
return lm.svc.RemoveChannel(key, id)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|
|
|
|
|
2018-04-04 10:15:23 +02:00
|
|
|
func (lm *loggingMiddleware) Connect(key, chanID, clientID string) (err error) {
|
2017-12-29 10:47:43 +01:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method connect for key %s, channel %s, client %s took %s to complete", key, chanID, clientID, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2018-03-11 18:06:01 +01:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-04-04 10:15:23 +02:00
|
|
|
return lm.svc.Connect(key, chanID, clientID)
|
2018-03-11 18:06:01 +01:00
|
|
|
}
|
|
|
|
|
2018-04-04 10:15:23 +02:00
|
|
|
func (lm *loggingMiddleware) Disconnect(key, chanID, clientID string) (err error) {
|
2018-03-11 18:06:01 +01:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method disconnect for key %s, channel %s, client %s took %s to complete", key, chanID, clientID, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2018-03-11 18:06:01 +01:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-04-04 10:15:23 +02:00
|
|
|
return lm.svc.Disconnect(key, chanID, clientID)
|
2018-03-11 18:06:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func (lm *loggingMiddleware) CanAccess(key string, id string) (pub string, err error) {
|
2017-09-23 01:03:27 +02:00
|
|
|
defer func(begin time.Time) {
|
2018-04-04 10:15:23 +02:00
|
|
|
message := fmt.Sprintf("Method can_access for key %s, channel %s and publisher %s took %s to complete", key, id, pub, time.Since(begin))
|
|
|
|
if err != nil {
|
|
|
|
lm.logger.Warn(fmt.Sprintf("%s with error: %s.", message, err))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lm.logger.Info(fmt.Sprintf("%s without errors.", message))
|
2017-09-23 01:03:27 +02:00
|
|
|
}(time.Now())
|
|
|
|
|
2018-03-11 18:06:01 +01:00
|
|
|
return lm.svc.CanAccess(key, id)
|
2017-09-23 01:03:27 +02:00
|
|
|
}
|