aecw/OpenList
1
0
Fork 0
mirror of https://github.com/OpenListTeam/OpenList.git synced 2026-03-15 03:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(bootstrap): move booting logic to bootstrap package (#1773)

Browse Source 
* refactor(bootstrap): move booting to bootstrap package

* chore(log): reduce level of some callings of `utils.Log.Fatal`

* fix(s3): no shutdown after SIGTERM received

* fix: add handle hook
This commit is contained in:
KirCute
2025-12-15 16:47:50 +08:00
committed by GitHub
parent 2dbe1b00d3
commit b2596fdc24
11 changed files with 441 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/ftp.go
View File

@@ -167,7 +167,7 @@ func lookupIP(host string) string {
}
ips, err := net.LookupIP(host)
if err != nil || len(ips) == 0 {
utils.Log.Fatalf("given FTP public host is invalid, and the default value will be used: %v", err)
utils.Log.Errorf("given FTP public host is invalid, and the default value will be used: %v", err)
return ""
}
for _, ip := range ips {
@@ -272,7 +272,7 @@ func newPortMapper(str string) ftpserver.PasvPortGetter {
break
}
if err != nil {
utils.Log.Fatalf("failed to convert FTP PASV port mapper %s: %v, the port mapper will be ignored.", mapper, err)
utils.Log.Errorf("failed to convert FTP PASV port mapper %s: %v, the port mapper will be ignored.", mapper, err)
return nil
}
}

12
server/sftp/hostkey.go
View File

@@ -24,7 +24,7 @@ func InitHostKey() {
if !utils.Exists(sshPath) {
err := utils.CreateNestedDirectory(sshPath)
if err != nil {
utils.Log.Fatalf("failed to create ssh directory: %+v", err)
utils.Log.Errorf("failed to create ssh directory: %+v", err)
return
}
}
@@ -54,30 +54,30 @@ func LoadOrGenerateRSAHostKey(parentDir string) (ssh.Signer, bool) {
_ = os.Remove(publicKeyPath)
privateKey, err := rsa.GenerateKey(rand.Reader, 4096)
if err != nil {
utils.Log.Fatalf("failed to generate RSA private key: %+v", err)
utils.Log.Errorf("failed to generate RSA private key: %+v", err)
return nil, false
}
publicKey, err := ssh.NewPublicKey(&privateKey.PublicKey)
if err != nil {
utils.Log.Fatalf("failed to generate RSA public key: %+v", err)
utils.Log.Errorf("failed to generate RSA public key: %+v", err)
return nil, false
}
ret, err := ssh.NewSignerFromKey(privateKey)
if err != nil {
utils.Log.Fatalf("failed to generate RSA signer: %+v", err)
utils.Log.Errorf("failed to generate RSA signer: %+v", err)
return nil, false
}
privateBytes := rsaEncodePrivateKey(privateKey)
publicBytes := ssh.MarshalAuthorizedKey(publicKey)
err = os.WriteFile(privateKeyPath, privateBytes, 0600)
if err != nil {
utils.Log.Fatalf("failed to write RSA private key to file: %+v", err)
utils.Log.Errorf("failed to write RSA private key to file: %+v", err)
return nil, false
}
err = os.WriteFile(publicKeyPath, publicBytes, 0644)
if err != nil {
_ = os.Remove(privateKeyPath)
utils.Log.Fatalf("failed to write RSA public key to file: %+v", err)
utils.Log.Errorf("failed to write RSA public key to file: %+v", err)
return nil, false
}
return ret, true