all: rename suffix Options with Config

Options means optional, while the field in struct may contains
mandatory or must not be empty.

1 files changed, 9 insertions, 9 deletions

diff --git a/server.go b/server.go
index ec6f016..8a8907b 100644
--- a/server.go
+++ b/server.go
@@ -33,7 +33,7 @@ type Server struct {
 	// from worker.
 	updateq chan struct{}
 
-	Options ServerOptions
+	Config ServerConfig
 
 	pageIndexTmpl *template.Template
 	pageIndexBody bytes.Buffer
@@ -44,20 +44,20 @@ type Server struct {
 }
 
 // NewServer create new server to serve the content of _www and HTTP APIs.
-func NewServer(opts ServerOptions) (srv *Server, err error) {
+func NewServer(cfg ServerConfig) (srv *Server, err error) {
 	var logp = `NewServer`
 
 	srv = &Server{
-		Options: opts,
+		Config:  cfg,
 		updateq: make(chan struct{}, 1),
 	}
 
-	err = srv.Options.init()
+	err = srv.Config.init()
 	if err != nil {
 		return nil, fmt.Errorf(`%s: %w`, logp, err)
 	}
 
-	srv.worker, err = newWorker(srv.Options)
+	srv.worker, err = newWorker(srv.Config)
 	if err != nil {
 		return nil, fmt.Errorf(`%s: %w`, logp, err)
 	}
@@ -75,7 +75,7 @@ func NewServer(opts ServerOptions) (srv *Server, err error) {
 	mux.Handle(`GET /`, srv)
 
 	srv.httpd = &http.Server{
-		Addr:         srv.Options.Address,
+		Addr:         srv.Config.Address,
 		Handler:      mux,
 		ReadTimeout:  5 * time.Second,
 		WriteTimeout: 5 * time.Second,
@@ -84,7 +84,7 @@ func NewServer(opts ServerOptions) (srv *Server, err error) {
 }
 
 func (srv *Server) initFS() (err error) {
-	if srv.Options.IsDevelopment {
+	if srv.Config.IsDevelopment {
 		var dirfs = os.DirFS(`_www`)
 		srv.fs = dirfs.(fs.ReadFileFS)
 	} else {
@@ -139,7 +139,7 @@ func (srv *Server) ListenAndServe() (err error) {
 	go srv.update()
 	go srv.worker.start(srv.updateq)
 
-	log.Printf(`lilin: starting HTTP server at %s`, srv.Options.Address)
+	log.Printf(`lilin: starting HTTP server at %s`, srv.Config.Address)
 
 	err = srv.httpd.ListenAndServe()
 	if err != nil {
@@ -212,7 +212,7 @@ func (srv *Server) update() {
 			srv.worker.Reports.Lock()
 
 			srv.pageIndexBody.Reset()
-			if srv.Options.IsDevelopment {
+			if srv.Config.IsDevelopment {
 				err = srv.initTemplate()
 			} else {
 				err = srv.pageIndexTmpl.Execute(