Jelajahi Sumber

portable mode: fix panic while validating TLS certificates

Fixes #1480

Signed-off-by: Nicola Murino <[email protected]>
Nicola Murino 1 tahun lalu
induk
melakukan
ff2eed8ee9
2 mengubah file dengan 5 tambahan dan 3 penghapusan
  1. 3 1
      internal/common/tlsutils.go
  2. 2 2
      internal/vfs/s3fs.go

+ 3 - 1
internal/common/tlsutils.go

@@ -308,6 +308,8 @@ func NewCertManager(keyPairs []TLSKeyPair, configDir, logSender string) (*CertMa
 	}
 	randSecs := rand.Intn(59)
 	manager.monitor()
-	_, err = eventScheduler.AddFunc(fmt.Sprintf("@every 8h0m%ds", randSecs), manager.monitor)
+	if eventScheduler != nil {
+		_, err = eventScheduler.AddFunc(fmt.Sprintf("@every 8h0m%ds", randSecs), manager.monitor)
+	}
 	return manager, err
 }

+ 2 - 2
internal/vfs/s3fs.go

@@ -699,8 +699,8 @@ func (fs *S3Fs) Walk(root string, walkFn filepath.WalkFunc) error {
 				continue
 			}
 			err := walkFn(util.GetStringFromPointer(fileObject.Key),
-				NewFileInfo(name, isDir, util.GetIntFromPointer(fileObject.Size), util.GetTimeFromPointer(fileObject.LastModified),
-					false), nil)
+				NewFileInfo(name, isDir, util.GetIntFromPointer(fileObject.Size),
+					util.GetTimeFromPointer(fileObject.LastModified), false), nil)
 			if err != nil {
 				return err
 			}