* add: generic cache random time offset expired. * bugfix: Csrf token should be Secure and httpOnly, but not now * fix: expose the Offset property to allow external modifications * improving the concurrency performance of random value calculation * add WithOffsetFunc to define private RandomExpireCache.offset field * fix: add seconds definition * build(deps): bump github.com/stretchr/testify from 1.7.1 to 1.8.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.1 to 1.8.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.7.1...v1.8.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix 4907: force admin service http only * Feat: add get all tasks function (#4999) * feat: add get all tasks function * Refine Comments : admin/profile.go,bean/mock.go,config/global.go... (#5009) * Refine Comments * refine comments for cache.go * refine comments for log.go * Update orm.go * refine comments for orm_log.go,types.go * Update utils.go * Update doc.go * refine comments for for four files (#5011) * refine comments for cache.go * refine comments for log.go * Update orm.go * refine comments for orm_log.go,types.go * Update utils.go * Update doc.go * Update db.go * fix pass []any as any in variadic function by asasalint (#5012) * fix pass []any as any in variadic function * add change log * build(deps): bump go.opentelemetry.io/otel/trace from 1.7.0 to 1.8.0 (#5019) Bumps [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.7.0...v1.8.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/trace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * refine comments for package core (#5014) * Refine Comments * refine comments for cache.go * refine comments for log.go * Update orm.go * refine comments for orm_log.go,types.go * Update utils.go * Update doc.go * refine comments * refine comments * Update db.go * refine comments for core * build(deps): bump go.opentelemetry.io/otel/exporters/stdout/stdouttrace (#5018) Bumps [go.opentelemetry.io/otel/exporters/stdout/stdouttrace](https://github.com/open-telemetry/opentelemetry-go) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.7.0...v1.8.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/exporters/stdout/stdouttrace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix 5022: Miss assiging ln to graceful Server (#5028) * prepare for releasing v2.0.5 * prepare for releasing v2.0.5 (#5032) * feat: make commands and docker compose for ORM unit tests (#5031) * feat: make commands and docker compose for ORM unit tests Signed-off-by: mango <xu.weiKyrie@foxmail.com> * add changelog Signed-off-by: mango <xu.weiKyrie@foxmail.com> Signed-off-by: mango <xu.weiKyrie@foxmail.com> * Modify comment syntax error (#5094) * fix: revise the body wrapper to handle empty body case (#5102) Fix the router.go serverHttp method, wrap the body if the request body is empty, which can avoid panic when calling the CopyBody method. Signed-off-by: chlins <chenyuzh@vmware.com> Signed-off-by: chlins <chenyuzh@vmware.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: mango <xu.weiKyrie@foxmail.com> Signed-off-by: chlins <chenyuzh@vmware.com> Co-authored-by: auual <ding@ibyte.me> Co-authored-by: Leon Ding <deen.job@qq.com> Co-authored-by: dada0z <zhang.guangda@qq.com> Co-authored-by: kevinzeng <kevinzeng@zego.im> Co-authored-by: Kevin Tsang <39397413+ktalg@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: 日暮颂歌1991 <448081525@qq.com> Co-authored-by: Regan Yue <1131625869@qq.com> Co-authored-by: alingse <alingse@foxmail.com> Co-authored-by: mango <35127166+mangoGoForward@users.noreply.github.com> Co-authored-by: 王哈哈 <31426858+wanghaha-dev@users.noreply.github.com> Co-authored-by: Chlins Zhang <chlins.zhang@gmail.com>
124 lines
2.5 KiB
Go
124 lines
2.5 KiB
Go
package es
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"net/url"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/elastic/go-elasticsearch/v6"
|
|
"github.com/elastic/go-elasticsearch/v6/esapi"
|
|
|
|
"github.com/beego/beego/v2/core/logs"
|
|
)
|
|
|
|
// NewES returns a LoggerInterface
|
|
func NewES() logs.Logger {
|
|
cw := &esLogger{
|
|
Level: logs.LevelDebug,
|
|
indexNaming: indexNaming,
|
|
}
|
|
return cw
|
|
}
|
|
|
|
// esLogger will log msg into ES
|
|
// before you using this implementation,
|
|
// please import this package
|
|
// usually means that you can import this package in your main package
|
|
// for example, anonymous:
|
|
// import _ "github.com/beego/beego/v2/core/logs/es"
|
|
type esLogger struct {
|
|
*elasticsearch.Client
|
|
DSN string `json:"dsn"`
|
|
Level int `json:"level"`
|
|
formatter logs.LogFormatter
|
|
Formatter string `json:"formatter"`
|
|
|
|
indexNaming IndexNaming
|
|
}
|
|
|
|
func (el *esLogger) Format(lm *logs.LogMsg) string {
|
|
msg := lm.OldStyleFormat()
|
|
idx := LogDocument{
|
|
Timestamp: lm.When.Format(time.RFC3339),
|
|
Msg: msg,
|
|
}
|
|
body, err := json.Marshal(idx)
|
|
if err != nil {
|
|
return msg
|
|
}
|
|
return string(body)
|
|
}
|
|
|
|
func (el *esLogger) SetFormatter(f logs.LogFormatter) {
|
|
el.formatter = f
|
|
}
|
|
|
|
// {"dsn":"http://localhost:9200/","level":1}
|
|
func (el *esLogger) Init(config string) error {
|
|
err := json.Unmarshal([]byte(config), el)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if el.DSN == "" {
|
|
return errors.New("empty dsn")
|
|
} else if u, err := url.Parse(el.DSN); err != nil {
|
|
return err
|
|
} else if u.Path == "" {
|
|
return errors.New("missing prefix")
|
|
} else {
|
|
conn, err := elasticsearch.NewClient(elasticsearch.Config{
|
|
Addresses: []string{el.DSN},
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
el.Client = conn
|
|
}
|
|
if len(el.Formatter) > 0 {
|
|
fmtr, ok := logs.GetFormatter(el.Formatter)
|
|
if !ok {
|
|
return errors.New(fmt.Sprintf("the formatter with name: %s not found", el.Formatter))
|
|
}
|
|
el.formatter = fmtr
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// WriteMsg writes the msg and level into es
|
|
func (el *esLogger) WriteMsg(lm *logs.LogMsg) error {
|
|
if lm.Level > el.Level {
|
|
return nil
|
|
}
|
|
|
|
msg := el.formatter.Format(lm)
|
|
|
|
req := esapi.IndexRequest{
|
|
Index: indexNaming.IndexName(lm),
|
|
DocumentType: "logs",
|
|
Body: strings.NewReader(msg),
|
|
}
|
|
_, err := req.Do(context.Background(), el.Client)
|
|
return err
|
|
}
|
|
|
|
// Destroy is an empty method
|
|
func (el *esLogger) Destroy() {
|
|
}
|
|
|
|
// Flush is an empty method
|
|
func (el *esLogger) Flush() {
|
|
}
|
|
|
|
type LogDocument struct {
|
|
Timestamp string `json:"timestamp"`
|
|
Msg string `json:"msg"`
|
|
}
|
|
|
|
func init() {
|
|
logs.Register(logs.AdapterEs, NewES)
|
|
}
|