Fix missing omitempty for NTP server fields

wyr121 · Dec 5, 2023 · cffc075 · cffc075
1 parent 0ef2686
commit cffc075
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ntp/service.go b/ntp/service.go
@@ -33,7 +33,7 @@ type Service struct {
 
 func NewService(ctx context.Context, router adapter.Router, logger logger.Logger, options option.NTPOptions) (*Service, error) {
 	ctx, cancel := common.ContextWithCancelCause(ctx)
-	server := options.ServerOptions.Build()
+	server := M.ParseSocksaddrHostPort(options.Server, options.ServerPort)
 	if server.Port == 0 {
 		server.Port = 123
 	}

diff --git a/option/ntp.go b/option/ntp.go
@@ -1,9 +1,10 @@
 package option
 
 type NTPOptions struct {
-	Enabled       bool     `json:"enabled"`
+	Enabled       bool     `json:"enabled,omitempty"`
+	Server        string   `json:"server,omitempty"`
+	ServerPort    uint16   `json:"server_port,omitempty"`
 	Interval      Duration `json:"interval,omitempty"`
 	WriteToSystem bool     `json:"write_to_system,omitempty"`
-	ServerOptions
 	DialerOptions
 }