haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-20 10:41:22 +00:00
Code Issues Releases Wiki Activity

Go fileserver support set db charset

Browse Source
This commit is contained in:
杨赫然
2024-12-09 11:11:29 +08:00
parent e8c0e81b57
commit eed3dc3ce6
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fileserver/fileserver.go
View File

@@ -106,6 +106,9 @@ func loadCcnetDB() {
} else { } else {
dsn = fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?tls=%t%s", dbOpt.User, dbOpt.Password, dbOpt.Host, dbOpt.Port, dbOpt.CcnetDbName, dbOpt.UseTLS, timeout) dsn = fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?tls=%t%s", dbOpt.User, dbOpt.Password, dbOpt.Host, dbOpt.Port, dbOpt.CcnetDbName, dbOpt.UseTLS, timeout)
} }
if dbOpt.Charset != "" {
dsn = fmt.Sprintf("%s&charset=%s", dsn, dbOpt.Charset)
}
ccnetDB, err = sql.Open("mysql", dsn) ccnetDB, err = sql.Open("mysql", dsn)
if err != nil { if err != nil {
log.Fatalf("Failed to open database: %v", err) log.Fatalf("Failed to open database: %v", err)
@@ -145,6 +148,7 @@ type DBOption struct {
CaPath string CaPath string
UseTLS bool UseTLS bool
SkipVerify bool SkipVerify bool
Charset string
} }
func loadDBOptionFromEnv(dbOpt *DBOption) *DBOption { func loadDBOptionFromEnv(dbOpt *DBOption) *DBOption {
@@ -241,6 +245,9 @@ func loadDBOptionFromFile() (*DBOption, error) {
if key, err = section.GetKey("ca_path"); err == nil { if key, err = section.GetKey("ca_path"); err == nil {
dbOpt.CaPath = key.String() dbOpt.CaPath = key.String()
} }
if key, err = section.GetKey("connection_charset"); err == nil {
dbOpt.Charset = key.String()
}
return dbOpt, nil return dbOpt, nil
} }
@@ -276,6 +283,9 @@ func loadSeafileDB() {
} else { } else {
dsn = fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?tls=%t%s", dbOpt.User, dbOpt.Password, dbOpt.Host, dbOpt.Port, dbOpt.SeafileDbName, dbOpt.UseTLS, timeout) dsn = fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?tls=%t%s", dbOpt.User, dbOpt.Password, dbOpt.Host, dbOpt.Port, dbOpt.SeafileDbName, dbOpt.UseTLS, timeout)
} }
if dbOpt.Charset != "" {
dsn = fmt.Sprintf("%s&charset=%s", dsn, dbOpt.Charset)
}
seafileDB, err = sql.Open("mysql", dsn) seafileDB, err = sql.Open("mysql", dsn)
if err != nil { if err != nil {