Browse Source

Fix reloading of tls.certificate_path, tls.key_path and tls.ech.key_path

zeetex 11 months ago
parent
commit
1d81996ceb
2 changed files with 3 additions and 3 deletions
  1. 2 2
      common/tls/ech_server.go
  2. 1 1
      common/tls/std_server.go

+ 2 - 2
common/tls/ech_server.go

@@ -98,7 +98,7 @@ func (c *echServerConfig) startWatcher() error {
 		return err
 	}
 	c.watcher = watcher
-	return nil
+	return c.watcher.Start()
 }
 
 func (c *echServerConfig) credentialsUpdated(path string) error {
@@ -232,7 +232,7 @@ func NewECHServer(ctx context.Context, logger log.Logger, options option.Inbound
 	var echKey []byte
 	if len(options.ECH.Key) > 0 {
 		echKey = []byte(strings.Join(options.ECH.Key, "\n"))
-	} else if options.KeyPath != "" {
+	} else if options.ECH.KeyPath != "" {
 		content, err := os.ReadFile(options.ECH.KeyPath)
 		if err != nil {
 			return nil, E.Cause(err, "read ECH key")

+ 1 - 1
common/tls/std_server.go

@@ -107,7 +107,7 @@ func (c *STDServerConfig) startWatcher() error {
 		return err
 	}
 	c.watcher = watcher
-	return nil
+	return c.watcher.Start()
 }
 
 func (c *STDServerConfig) certificateUpdated(path string) error {