* feature extend readthrough for cache module (#5116) * feature 增加readthrough * feature: add write though for cache mode (#5117) * feature: add writethough for cache mode * feature add singleflight cache (#5119) * build(deps): bump go.opentelemetry.io/otel/trace from 1.8.0 to 1.11.2 Bumps [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) from 1.8.0 to 1.11.2. - [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.8.0...v1.11.2) --- 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> * fix 5129: must set formatter after init the logger * remove beego.vip * build(deps): bump actions/stale from 5 to 7 Bumps [actions/stale](https://github.com/actions/stale) from 5 to 7. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5...v7) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix 5079: only log msg when the channel is not closed (#5132) * optimize test * upgrade otel dependencies to v1.11.2 * format code * Bloom filter cache (#5126) * feature: add bloom filter cache * feature upload remove all temp file * bugfix Controller SaveToFile remove all temp file * rft: motify BeeLogger signalChan (#5139) * add non-block write log in asynchronous mode (#5150) * add non-block write log in asynchronous mode --------- Co-authored-by: chenhaokun <chenhaokun@itiger.com> * fix the docsite URL (#5173) * Unified gopkg.in/yaml version to v2 (#5169) * Unified gopkg.in/yaml version to v2 and go mod tidy * update CHANGELOG * bugfix: protect field access with lock to avoid possible data race (#5211) * fix some comments (#5194) Signed-off-by: cui fliter <imcusg@gmail.com> * build(deps): bump github.com/prometheus/client_golang (#5213) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.14.0 to 1.15.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.14.0...v1.15.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang 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> * build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.4 to 3.5.9 (#5209) Bumps [go.etcd.io/etcd/client/v3](https://github.com/etcd-io/etcd) from 3.5.4 to 3.5.9. - [Release notes](https://github.com/etcd-io/etcd/releases) - [Commits](https://github.com/etcd-io/etcd/compare/v3.5.4...v3.5.9) --- updated-dependencies: - dependency-name: go.etcd.io/etcd/client/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * cache: fix typo and optimize the naming * Release 2.1.0 change log * bugfix: beegoAppConfig String and Strings function has bug * httplib: fix unstable test, do not use httplib.org * chore: pkg imported more than once * chore: fmt modify * chore: Use github.com/go-kit/log * chore: unnecessary use of fmt.Sprintf * fix: golangci-lint error * orm: refactor ORM introducing internal/models pkg * remove adapter package * build(deps): bump github.com/bits-and-blooms/bloom/v3 Bumps [github.com/bits-and-blooms/bloom/v3](https://github.com/bits-and-blooms/bloom) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/bits-and-blooms/bloom/releases) - [Commits](https://github.com/bits-and-blooms/bloom/compare/v3.3.1...v3.5.0) --- updated-dependencies: - dependency-name: github.com/bits-and-blooms/bloom/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * feat: add write-delete cache mode * fix: unnecessary assignment to the blank identifier * fix: add change into .CHANGELOG file * build(deps): bump golang.org/x/sync from 0.1.0 to 0.3.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.1.0 to 0.3.0. - [Commits](https://github.com/golang/sync/compare/v0.1.0...v0.3.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump golang.org/x/crypto Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20220315160706-3147a52a75dd to 0.10.0. - [Commits](https://github.com/golang/crypto/commits/v0.10.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * remove golang--lint-ci * Beego web.Run() runs the server twice * fix 5255: Check the rows.Err() if rows.Next() is false * closes 5254: %COL% should be a common placeholder * build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.15.1 to 1.16.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.15.1...v1.16.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix: use of ioutil package (#5261) * fix ioutil.NopCloser * fix ioutil.ReadAll * fix ioutil.ReadFile * fix ioutil.WriteFile * run goimports -w -format-only ./ * update CHANGELOG.md * feature: add write-double-delete cache mode (#5263) * cache/redis: support skipEmptyPrefix option (#5264) * fix: refactor InsertValue method (#5267) * fix: refactor insertValue method and add the test * fix: exec goimports and add Licence file header * fix: modify construct method of dbBase * fix: add modify record into CHANGELOG * fix: modify InsertOrUpdate method (#5269) * fix: modify InsertOrUpdate method, Remove the isMulti variable and its associated code * fix: Delete unnecessary judgment branches * fix: add modify record into CHANGELOG * cache/redis: use redisConfig to receive incoming JSON (previously using a map) (#5268) * refactor cache/redis: Use redisConfig to receive incoming JSON (previously using a map). * refactor cache/redis: Use the string type to receive JSON parameters. --------- Co-authored-by: Tan <tanqianheng@gmail.com> * fix: refactor Delete method (#5271) * fix: refactor Delete method and add test * fix: add modify record into CHANGELOG * fix: refactor update sql (#5274) * fix: refactor UpdateSQL method and add test * fix: add modify record into CHANGELOG * fix: modify url in the CHANGELOG * fix: modify pr url in the CHANGELOG * Fix setPK function for table without primary key (#5276) --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: cui fliter <imcusg@gmail.com> Co-authored-by: Stone-afk <73482944+Stone-afk@users.noreply.github.com> Co-authored-by: hookokoko <hooko@tju.edu.cn> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hookokoko <648646891@qq.com> Co-authored-by: Stone-afk <1711865140@qq.com> Co-authored-by: chenhaokun <chenhaokun@itiger.com> Co-authored-by: Xuing <admin@xuing.cn> Co-authored-by: cui fliter <imcusg@gmail.com> Co-authored-by: guoguangwu <guoguangwu@magic-shield.com> Co-authored-by: uzziah <uzziahlin@gmail.com> Co-authored-by: Hanjiang Yu <delacroix.yu@gmail.com> Co-authored-by: Kota <mdryzk64smsh@gmail.com> Co-authored-by: Uzziah <120019273+uzziahlin@users.noreply.github.com> Co-authored-by: Handkerchiefs-t <59816423+Handkerchiefs-t@users.noreply.github.com> Co-authored-by: Tan <tanqianheng@gmail.com> Co-authored-by: mlgd <mlgd17@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 fmt.Errorf("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)
 | |
| }
 |