msb-public
/
paopao-ce
mirror of https://github.com/rocboss/paopao-ce
1
0
Code Issues Projects Releases Wiki Activity

optimize configure process logic

Browse Source
pull/259/head
Michael Li 2 years ago
parent 78282539f3
commit 3147e25189
No known key found for this signature in database
5 changed files with 378 additions and 406 deletions
Show Stats Download Patch File Download Diff File

12
internal/conf/conf.go
Unescape View File

@ -53,13 +53,13 @@ var (
) )
func setupSetting(suite []string, noDefault bool) error { func setupSetting(suite []string, noDefault bool) error {
setting, err := newSetting() vp, err := newViper()
if err != nil { if err != nil {
return err return err
} }
// initialize features configure // initialize features configure
ss, kv := setting.featuresInfoFrom("Features") ss, kv := featuresInfoFrom(vp, "Features")
cfg.Initial(ss, kv) cfg.Initial(ss, kv)
if len(suite) > 0 { if len(suite) > 0 {
cfg.Use(suite, noDefault) cfg.Use(suite, noDefault)
@ -104,8 +104,11 @@ func setupSetting(suite []string, noDefault bool) error {
"LocalOSS": &LocalOSSSetting, "LocalOSS": &LocalOSSSetting,
"S3": &S3Setting, "S3": &S3Setting,
} }
if err = setting.Unmarshal(objects); err != nil { for k, v := range objects {
return err err := vp.UnmarshalKey(k, v)
if err != nil {
return err
}
} }
JWTSetting.Expire *= time.Second JWTSetting.Expire *= time.Second
@ -123,7 +126,6 @@ func Initial(suite []string, noDefault bool) {
if err != nil { if err != nil {
log.Fatalf("init.setupSetting err: %v", err) log.Fatalf("init.setupSetting err: %v", err)
} }
setupLogger() setupLogger()
initSentry() initSentry()
} }

368
internal/conf/core.go
Unescape View File

@ -1,368 +0,0 @@
// Copyright 2023 ROC. All rights reserved.
// Use of this source code is governed by a MIT style
// license that can be found in the LICENSE file.
package conf
import (
"fmt"
"strings"
"time"
"github.com/pyroscope-io/client/pyroscope"
"github.com/sirupsen/logrus"
"gorm.io/gorm/logger"
)
type pyroscopeConf struct {
AppName string
Endpoint string
AuthToken string
Logger string
}
type sentryConf struct {
Dsn string
Debug bool
AttachStacktrace bool
TracesSampleRate float64
AttachLogrus bool
AttachGin bool
}
type loggerConf struct {
Level string
}
type loggerFileConf struct {
SavePath string
FileName string
FileExt string
}
type loggerZincConf struct {
Host string
Index string
User string
Password string
Secure bool
}
type loggerMeiliConf struct {
Host string
Index string
ApiKey string
Secure bool
MaxLogBuffer int
MinWorker int
}
type httpServerConf struct {
RunMode string
HttpIp string
HttpPort string
ReadTimeout time.Duration
WriteTimeout time.Duration
}
type grpcServerConf struct {
Host string
Port string
}
type appConf struct {
RunMode string
MaxCommentCount int64
AttachmentIncomeRate float64
DefaultContextTimeout time.Duration
DefaultPageSize int
MaxPageSize int
}
type cacheIndexConf struct {
MaxUpdateQPS int
MinWorker int
}
type simpleCacheIndexConf struct {
MaxIndexSize int
CheckTickDuration time.Duration
ExpireTickDuration time.Duration
}
type bigCacheIndexConf struct {
MaxIndexPage int
HardMaxCacheSize int
ExpireInSecond time.Duration
Verbose bool
}
type redisCacheIndexConf struct {
ExpireInSecond time.Duration
Verbose bool
}
type alipayConf struct {
AppID string
PrivateKey string
RootCertFile string
PublicCertFile string
AppPublicCertFile string
InProduction bool
}
type smsJuheConf struct {
Gateway string
Key string
TplID string
TplVal string
}
type tweetSearchConf struct {
MaxUpdateQPS int
MinWorker int
}
type zincConf struct {
Host string
Index string
User string
Password string
Secure bool
}
type meiliConf struct {
Host string
Index string
ApiKey string
Secure bool
}
type databaseConf struct {
TablePrefix string
LogLevel string
}
type mysqlConf struct {
UserName string
Password string
Host string
DBName string
Charset string
ParseTime bool
MaxIdleConns int
MaxOpenConns int
}
type postgresConf map[string]string
type sqlite3Conf struct {
Path string
}
type objectStorageS struct {
RetainInDays int
TempDir string
}
type minioConf struct {
AccessKey string
SecretKey string
Secure bool
Endpoint string
Bucket string
Domain string
}
type s3Conf struct {
AccessKey string
SecretKey string
Secure bool
Endpoint string
Bucket string
Domain string
}
type aliOSSConf struct {
AccessKeyID string
AccessKeySecret string
Endpoint string
Bucket string
Domain string
}
type cosConf struct {
SecretID string
SecretKey string
Region string
Bucket string
Domain string
}
type huaweiOBSConf struct {
AccessKey string
SecretKey string
Endpoint string
Bucket string
Domain string
}
type localossConf struct {
SavePath string
Secure bool
Bucket string
Domain string
}
type redisConf struct {
InitAddress []string
Username string
Password string
SelectDB int
ConnWriteTimeout time.Duration
}
type jwtConf struct {
Secret string
Issuer string
Expire time.Duration
}
func (s *httpServerConf) GetReadTimeout() time.Duration {
return s.ReadTimeout * time.Second
}
func (s *httpServerConf) GetWriteTimeout() time.Duration {
return s.WriteTimeout * time.Second
}
func (s *mysqlConf) Dsn() string {
return fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=%s&parseTime=%t&loc=Local",
s.UserName,
s.Password,
s.Host,
s.DBName,
s.Charset,
s.ParseTime,
)
}
func (s postgresConf) Dsn() string {
var params []string
for k, v := range s {
if len(v) == 0 {
continue
}
lk := strings.ToLower(k)
tv := strings.Trim(v, " ")
switch lk {
case "schema":
params = append(params, "search_path="+tv)
case "applicationname":
params = append(params, "application_name="+tv)
default:
params = append(params, lk+"="+tv)
}
}
return strings.Join(params, " ")
}
func (s *sqlite3Conf) Dsn(driverName string) string {
pragmas := "_foreign_keys=1&_journal_mode=WAL&_synchronous=NORMAL&_busy_timeout=8000"
if driverName == "sqlite" {
pragmas = "_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_pragma=synchronous(NORMAL)&_pragma=busy_timeout(8000)&_pragma=journal_size_limit(100000000)"
}
return fmt.Sprintf("file:%s?%s", s.Path, pragmas)
}
func (s *databaseConf) logLevel() logger.LogLevel {
switch strings.ToLower(s.LogLevel) {
case "silent":
return logger.Silent
case "error":
return logger.Error
case "warn":
return logger.Warn
case "info":
return logger.Info
default:
return logger.Error
}
}
func (s *loggerConf) logLevel() logrus.Level {
switch strings.ToLower(s.Level) {
case "panic":
return logrus.PanicLevel
case "fatal":
return logrus.FatalLevel
case "error":
return logrus.ErrorLevel
case "warn", "warning":
return logrus.WarnLevel
case "info":
return logrus.InfoLevel
case "debug":
return logrus.DebugLevel
case "trace":
return logrus.TraceLevel
default:
return logrus.ErrorLevel
}
}
func (s *loggerZincConf) Endpoint() string {
return endpoint(s.Host, s.Secure)
}
func (s *loggerMeiliConf) Endpoint() string {
return endpoint(s.Host, s.Secure)
}
func (s *loggerMeiliConf) minWork() int {
if s.MinWorker < 5 {
return 5
} else if s.MinWorker > 100 {
return 100
}
return s.MinWorker
}
func (s *loggerMeiliConf) maxLogBuffer() int {
if s.MaxLogBuffer < 10 {
return 10
} else if s.MaxLogBuffer > 1000 {
return 1000
}
return s.MaxLogBuffer
}
func (s *objectStorageS) TempDirSlash() string {
return strings.Trim(s.TempDir, " /") + "/"
}
func (s *zincConf) Endpoint() string {
return endpoint(s.Host, s.Secure)
}
func (s *meiliConf) Endpoint() string {
return endpoint(s.Host, s.Secure)
}
func (s *pyroscopeConf) GetLogger() (logger pyroscope.Logger) {
switch strings.ToLower(s.Logger) {
case "standard":
logger = pyroscope.StandardLogger
case "logrus":
logger = logrus.StandardLogger()
}
return
}
func endpoint(host string, secure bool) string {
schema := "http"
if secure {
schema = "https"
}
return schema + "://" + host
}

12
internal/conf/db.go
Unescape View File

@ -19,21 +19,21 @@ import (
) )
var ( var (
db *gorm.DB _gormDB *gorm.DB
once sync.Once _onceGorm sync.Once
) )
func MustGormDB() *gorm.DB { func MustGormDB() *gorm.DB {
once.Do(func() { _onceGorm.Do(func() {
var err error var err error
if db, err = newDBEngine(); err != nil { if _gormDB, err = newGormDB(); err != nil {
logrus.Fatalf("new gorm db failed: %s", err) logrus.Fatalf("new gorm db failed: %s", err)
} }
}) })
return db return _gormDB
} }
func newDBEngine() (*gorm.DB, error) { func newGormDB() (*gorm.DB, error) {
newLogger := logger.New( newLogger := logger.New(
logrus.StandardLogger(), // io writer（日志输出的目标，前缀和日志包含的内容） logrus.StandardLogger(), // io writer（日志输出的目标，前缀和日志包含的内容）
logger.Config{ logger.Config{

4
internal/conf/redis.go
Unescape View File

@ -13,11 +13,11 @@ import (
var ( var (
_redisClient rueidis.Client _redisClient rueidis.Client
_once sync.Once _onceRedis sync.Once
) )
func MustRedisClient() rueidis.Client { func MustRedisClient() rueidis.Client {
_once.Do(func() { _onceRedis.Do(func() {
client, err := rueidis.NewClient(rueidis.ClientOption{ client, err := rueidis.NewClient(rueidis.ClientOption{
InitAddress: redisSetting.InitAddress, InitAddress: redisSetting.InitAddress,
Username: redisSetting.Username, Username: redisSetting.Username,

388
internal/conf/setting.go
Unescape View File

@ -1,4 +1,4 @@
// Copyright 2022 ROC. All rights reserved. // Copyright 2023 ROC. All rights reserved.
// Use of this source code is governed by a MIT style // Use of this source code is governed by a MIT style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
@ -7,17 +7,373 @@ package conf
import ( import (
"bytes" "bytes"
_ "embed" _ "embed"
"fmt"
"strings"
"time"
"github.com/pyroscope-io/client/pyroscope"
"github.com/sirupsen/logrus"
"github.com/spf13/viper" "github.com/spf13/viper"
"gorm.io/gorm/logger"
) )
//go:embed config.yaml //go:embed config.yaml
var fileBytes []byte var fileBytes []byte
type setting struct { type pyroscopeConf struct {
vp *viper.Viper AppName string
Endpoint string
AuthToken string
Logger string
}
type sentryConf struct {
Dsn string
Debug bool
AttachStacktrace bool
TracesSampleRate float64
AttachLogrus bool
AttachGin bool
}
type loggerConf struct {
Level string
}
type loggerFileConf struct {
SavePath string
FileName string
FileExt string
}
type loggerZincConf struct {
Host string
Index string
User string
Password string
Secure bool
}
type loggerMeiliConf struct {
Host string
Index string
ApiKey string
Secure bool
MaxLogBuffer int
MinWorker int
}
type httpServerConf struct {
RunMode string
HttpIp string
HttpPort string
ReadTimeout time.Duration
WriteTimeout time.Duration
}
type grpcServerConf struct {
Host string
Port string
}
type appConf struct {
RunMode string
MaxCommentCount int64
AttachmentIncomeRate float64
DefaultContextTimeout time.Duration
DefaultPageSize int
MaxPageSize int
}
type cacheIndexConf struct {
MaxUpdateQPS int
MinWorker int
}
type simpleCacheIndexConf struct {
MaxIndexSize int
CheckTickDuration time.Duration
ExpireTickDuration time.Duration
}
type bigCacheIndexConf struct {
MaxIndexPage int
HardMaxCacheSize int
ExpireInSecond time.Duration
Verbose bool
}
type redisCacheIndexConf struct {
ExpireInSecond time.Duration
Verbose bool
}
type alipayConf struct {
AppID string
PrivateKey string
RootCertFile string
PublicCertFile string
AppPublicCertFile string
InProduction bool
}
type smsJuheConf struct {
Gateway string
Key string
TplID string
TplVal string
}
type tweetSearchConf struct {
MaxUpdateQPS int
MinWorker int
}
type zincConf struct {
Host string
Index string
User string
Password string
Secure bool
}
type meiliConf struct {
Host string
Index string
ApiKey string
Secure bool
}
type databaseConf struct {
TablePrefix string
LogLevel string
}
type mysqlConf struct {
UserName string
Password string
Host string
DBName string
Charset string
ParseTime bool
MaxIdleConns int
MaxOpenConns int
}
type postgresConf map[string]string
type sqlite3Conf struct {
Path string
}
type objectStorageS struct {
RetainInDays int
TempDir string
}
type minioConf struct {
AccessKey string
SecretKey string
Secure bool
Endpoint string
Bucket string
Domain string
}
type s3Conf struct {
AccessKey string
SecretKey string
Secure bool
Endpoint string
Bucket string
Domain string
}
type aliOSSConf struct {
AccessKeyID string
AccessKeySecret string
Endpoint string
Bucket string
Domain string
}
type cosConf struct {
SecretID string
SecretKey string
Region string
Bucket string
Domain string
}
type huaweiOBSConf struct {
AccessKey string
SecretKey string
Endpoint string
Bucket string
Domain string
}
type localossConf struct {
SavePath string
Secure bool
Bucket string
Domain string
}
type redisConf struct {
InitAddress []string
Username string
Password string
SelectDB int
ConnWriteTimeout time.Duration
}
type jwtConf struct {
Secret string
Issuer string
Expire time.Duration
}
func (s *httpServerConf) GetReadTimeout() time.Duration {
return s.ReadTimeout * time.Second
}
func (s *httpServerConf) GetWriteTimeout() time.Duration {
return s.WriteTimeout * time.Second
}
func (s *mysqlConf) Dsn() string {
return fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=%s&parseTime=%t&loc=Local",
s.UserName,
s.Password,
s.Host,
s.DBName,
s.Charset,
s.ParseTime,
)
}
func (s postgresConf) Dsn() string {
var params []string
for k, v := range s {
if len(v) == 0 {
continue
}
lk := strings.ToLower(k)
tv := strings.Trim(v, " ")
switch lk {
case "schema":
params = append(params, "search_path="+tv)
case "applicationname":
params = append(params, "application_name="+tv)
default:
params = append(params, lk+"="+tv)
}
}
return strings.Join(params, " ")
}
func (s *sqlite3Conf) Dsn(driverName string) string {
pragmas := "_foreign_keys=1&_journal_mode=WAL&_synchronous=NORMAL&_busy_timeout=8000"
if driverName == "sqlite" {
pragmas = "_pragma=foreign_keys(1)&_pragma=journal_mode(WAL)&_pragma=synchronous(NORMAL)&_pragma=busy_timeout(8000)&_pragma=journal_size_limit(100000000)"
}
return fmt.Sprintf("file:%s?%s", s.Path, pragmas)
}
func (s *databaseConf) logLevel() logger.LogLevel {
switch strings.ToLower(s.LogLevel) {
case "silent":
return logger.Silent
case "error":
return logger.Error
case "warn":
return logger.Warn
case "info":
return logger.Info
default:
return logger.Error
}
}
func (s *loggerConf) logLevel() logrus.Level {
switch strings.ToLower(s.Level) {
case "panic":
return logrus.PanicLevel
case "fatal":
return logrus.FatalLevel
case "error":
return logrus.ErrorLevel
case "warn", "warning":
return logrus.WarnLevel
case "info":
return logrus.InfoLevel
case "debug":
return logrus.DebugLevel
case "trace":
return logrus.TraceLevel
default:
return logrus.ErrorLevel
}
} }
func newSetting() (*setting, error) { func (s *loggerZincConf) Endpoint() string {
return endpoint(s.Host, s.Secure)
}
func (s *loggerMeiliConf) Endpoint() string {
return endpoint(s.Host, s.Secure)
}
func (s *loggerMeiliConf) minWork() int {
if s.MinWorker < 5 {
return 5
} else if s.MinWorker > 100 {
return 100
}
return s.MinWorker
}
func (s *loggerMeiliConf) maxLogBuffer() int {
if s.MaxLogBuffer < 10 {
return 10
} else if s.MaxLogBuffer > 1000 {
return 1000
}
return s.MaxLogBuffer
}
func (s *objectStorageS) TempDirSlash() string {
return strings.Trim(s.TempDir, " /") + "/"
}
func (s *zincConf) Endpoint() string {
return endpoint(s.Host, s.Secure)
}
func (s *meiliConf) Endpoint() string {
return endpoint(s.Host, s.Secure)
}
func (s *pyroscopeConf) GetLogger() (logger pyroscope.Logger) {
switch strings.ToLower(s.Logger) {
case "standard":
logger = pyroscope.StandardLogger
case "logrus":
logger = logrus.StandardLogger()
}
return
}
func endpoint(host string, secure bool) string {
schema := "http"
if secure {
schema = "https"
}
return schema + "://" + host
}
func newViper() (*viper.Viper, error) {
vp := viper.New() vp := viper.New()
vp.SetConfigName("config") vp.SetConfigName("config")
vp.AddConfigPath(".") vp.AddConfigPath(".")
@ -30,29 +386,11 @@ func newSetting() (*setting, error) {
if err = vp.MergeInConfig(); err != nil { if err = vp.MergeInConfig(); err != nil {
return nil, err return nil, err
} }
return &setting{vp}, nil return vp, nil
}
func (s *setting) ReadSection(k string, v any) error {
err := s.vp.UnmarshalKey(k, v)
if err != nil {
return err
}
return nil
}
func (s *setting) Unmarshal(objects map[string]any) error {
for k, v := range objects {
err := s.vp.UnmarshalKey(k, v)
if err != nil {
return err
}
}
return nil
} }
func (s *setting) featuresInfoFrom(k string) (map[string][]string, map[string]string) { func featuresInfoFrom(vp *viper.Viper, k string) (map[string][]string, map[string]string) {
sub := s.vp.Sub(k) sub := vp.Sub(k)
keys := sub.AllKeys() keys := sub.AllKeys()
suites := make(map[string][]string) suites := make(map[string][]string)

Write Preview
Loading…
Cancel
Save