Rewired db connection to store/rdbms
This commit is contained in:
Denis Arh
@@ -1,132 +0,0 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/titpetric/factory"
|
||||
"github.com/titpetric/factory/logger"
|
||||
"go.uber.org/zap"
|
||||
|
||||
"github.com/cortezaproject/corteza-server/pkg/options"
|
||||
"github.com/cortezaproject/corteza-server/pkg/sentry"
|
||||
)
|
||||
|
||||
var (
|
||||
dsnMasker = regexp.MustCompile("(.)(?:.*)(.):(.)(?:.*)(.)@")
|
||||
)
|
||||
|
||||
func TryToConnect(ctx context.Context, log *zap.Logger, opt options.DBOpt) (db *factory.DB, err error) {
|
||||
if opt.DSN == "" {
|
||||
err = errors.Errorf("invalid or empty DSN: %q", opt.DSN)
|
||||
return
|
||||
}
|
||||
|
||||
name := "default"
|
||||
|
||||
// Trim off the schema, as titpetric/factory does not support it
|
||||
if strings.HasPrefix(opt.DSN, "mysql://") {
|
||||
opt.DSN = opt.DSN[8:]
|
||||
}
|
||||
|
||||
factory.Database.Add(name, factory.DatabaseCredential{DSN: opt.DSN, DriverName: "mysql"})
|
||||
|
||||
var (
|
||||
connErrCh = make(chan error, 1)
|
||||
)
|
||||
|
||||
// We'll not add this to the general log because we do not want to carry it with us for every query.
|
||||
dsnField := zap.String("dsn", dsnMasker.ReplaceAllString(opt.DSN, "$1****$2:$3****$4@"))
|
||||
|
||||
// This logger is also used inside profiler
|
||||
log = log.Named("database").With(zap.String("name", name))
|
||||
|
||||
defer close(connErrCh)
|
||||
|
||||
log.Debug("connecting to the database",
|
||||
dsnField,
|
||||
zap.Int("tries", opt.MaxTries),
|
||||
zap.Duration("delay", opt.Delay),
|
||||
zap.Duration("timeout", opt.Timeout))
|
||||
|
||||
go func() {
|
||||
defer sentry.Recover()
|
||||
|
||||
var (
|
||||
try = 0
|
||||
)
|
||||
|
||||
for {
|
||||
try++
|
||||
|
||||
if opt.MaxTries <= try {
|
||||
err = errors.Errorf("could not connect to %q, in %d tries", name, try)
|
||||
return
|
||||
}
|
||||
|
||||
db, err = factory.Database.Get(name)
|
||||
if err != nil {
|
||||
log.Warn(
|
||||
"could not connect to the database",
|
||||
zap.Error(err),
|
||||
zap.Int("try", try),
|
||||
dsnField,
|
||||
zap.Float64("delay", opt.Delay.Seconds()),
|
||||
)
|
||||
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
// Forced break
|
||||
break
|
||||
case <-time.After(opt.Delay):
|
||||
// Wait before next try
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
// hardcoded values for POC
|
||||
// @todo make this configurable, same as other options (DB_*)
|
||||
db.SetConnMaxLifetime(10 * time.Minute)
|
||||
db.SetMaxOpenConns(256)
|
||||
db.SetMaxIdleConns(32)
|
||||
|
||||
log.Debug("connected to the database", dsnField)
|
||||
|
||||
// Connected
|
||||
break
|
||||
|
||||
}
|
||||
|
||||
connErrCh <- err
|
||||
}()
|
||||
|
||||
select {
|
||||
case err = <-connErrCh:
|
||||
break
|
||||
case <-time.After(opt.Timeout):
|
||||
// Wait before next try
|
||||
return nil, errors.Errorf("db init for %q timedout", name)
|
||||
case <-ctx.Done():
|
||||
return nil, errors.Errorf("db connection for %q cancelled", name)
|
||||
}
|
||||
|
||||
if opt.Logger {
|
||||
db.SetLogger(
|
||||
NewZapLogger(
|
||||
// Skip 3 levels in call stack to get to the actual function used
|
||||
log.WithOptions(zap.AddCallerSkip(3)),
|
||||
),
|
||||
)
|
||||
} else {
|
||||
db.SetLogger(logger.Silent{})
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return db, nil
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/titpetric/factory"
|
||||
)
|
||||
|
||||
func Healthcheck() func(ctx context.Context) error {
|
||||
const name = "default"
|
||||
return func(ctx context.Context) error {
|
||||
db, err := factory.Database.Get(name)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = db.PingContext(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
dbLogger "github.com/titpetric/factory/logger"
|
||||
"go.uber.org/zap"
|
||||
|
||||
"github.com/cortezaproject/corteza-server/pkg/logger"
|
||||
)
|
||||
|
||||
type (
|
||||
zapLogger struct {
|
||||
logger *zap.Logger
|
||||
}
|
||||
)
|
||||
|
||||
func NewZapLogger(logger *zap.Logger) *zapLogger {
|
||||
return &zapLogger{
|
||||
logger: logger,
|
||||
}
|
||||
}
|
||||
|
||||
func (z *zapLogger) Log(ctx context.Context, msg string, fields ...dbLogger.Field) {
|
||||
// @todo when factory.DatabaseProfilerContext gets access to context from
|
||||
// db functions, try to extract RequestID with middleware.GetReqID()
|
||||
|
||||
zapFields := []zap.Field{}
|
||||
for _, v := range fields {
|
||||
zapFields = append(zapFields, zap.Any(v.Name(), v.Value()))
|
||||
}
|
||||
|
||||
logger.
|
||||
AddRequestID(ctx, z.logger).
|
||||
Debug(msg, zapFields...)
|
||||
}
|
||||
+2
-10
@@ -7,11 +7,7 @@ import (
|
||||
|
||||
type (
|
||||
DBOpt struct {
|
||||
DSN string `env:"DB_DSN"`
|
||||
Logger bool `env:"DB_LOGGER"`
|
||||
MaxTries int `env:"DB_MAX_TRIES"`
|
||||
Delay time.Duration `env:"DB_CONN_ERR_DELAY"`
|
||||
Timeout time.Duration `env:"DB_CONN_TIMEOUT"`
|
||||
DSN string `env:"DB_DSN"`
|
||||
}
|
||||
)
|
||||
|
||||
@@ -20,11 +16,7 @@ func DB(pfix string) (o *DBOpt) {
|
||||
const maxTries = 100
|
||||
|
||||
o = &DBOpt{
|
||||
DSN: "mysql://corteza:corteza@tcp(db:3306)/corteza?collation=utf8mb4_general_ci",
|
||||
Logger: false,
|
||||
MaxTries: maxTries,
|
||||
Delay: delay,
|
||||
Timeout: maxTries * delay,
|
||||
DSN: "mysql://corteza:corteza@tcp(db:3306)/corteza?collation=utf8mb4_general_ci",
|
||||
}
|
||||
|
||||
fill(o)
|
||||
|
||||
Reference in New Issue
Block a user