add https server

conf/conf.go

@@ -11,6 +11,8 @@ type Tips struct {
 type Server struct {
 	Tikv   Tikv   `cfg:"tikv"`
 	Listen string `cfg:"listen; 0.0.0.0:7369; netaddr; address to listen"`
+	Key    string `cfg:"key;;; key file name"`
+	Cert   string `cfg:"Cert;;; tls session ticket file name. ticket use: openssl rand 32"`
 }
 
 type Tikv struct {

conf/tips.toml

@@ -0,0 +1,91 @@
+#type:        string
+#description: the file name to record connd PID
+#default:     tips.pid
+#pid-filename = "tips.pid"
+
+[server]
+
+#type:        string
+#rules:       netaddr
+#description: address to listen
+#default:     0.0.0.0:7369
+#listen = "0.0.0.0:7369"
+
+#type:        string
+#description: key file name
+key = ""
+
+#type:        string
+#description: tls session ticket file name. ticket use: openssl rand 32
+Cert = ""
+
+[server.tikv]
+
+#type:        string
+#description: pd address in tidb
+#required
+pd-addrs = ""
+
+
+[status]
+
+#type:        string
+#rules:       nonempty
+#description: listen address of http server
+#default:     0.0.0.0:7345
+#listen = "0.0.0.0:7345"
+
+
+[tikv-logger]
+
+#type:        string
+#rules:       nonempty
+#description: the default log path
+#default:     logs/tikv
+#path = "logs/tikv"
+
+#type:        string
+#description: log level(debug, info, warn, error, panic, fatal)
+#default:     info
+#level = "info"
+
+#type:        bool
+#rules:       boolean
+#description: true for enabling log compress
+#default:     false
+#compress = false
+
+#type:        string
+#description: log time rotate pattern(s m h D M W)
+#default:     0 0 0 * * *
+#time-rotate = "0 0 0 * * *"
+
+
+[logger]
+
+#type:        string
+#description: the default logger name
+#default:     tips
+#name = "tips"
+
+#type:        string
+#description: the default log path
+#default:     logs/tips
+#path = "logs/tips"
+
+#type:        string
+#description: log level(debug, info, warn, error, panic, fatal)
+#default:     info
+#level = "info"
+
+#type:        bool
+#rules:       boolean
+#description: true for enabling log compress
+#default:     false
+#compress = false
+
+#type:        string
+#description: log time rotate pattern(s m h D M W)
+#default:     0 0 0 * * *
+#time-rotate = "0 0 0 * * *"
+

tipsd/main_test.go

@@ -16,7 +16,7 @@ var addr = "127.0.0.1:12345"
 var url = "http://127.0.0.1:12345"
 
 func TestMain(m *testing.M) {
-	var conf *conf.Server
+	conf := &conf.Server{}
 	pubsub, _ := tips.MockTips()
 	server := NewServer(conf, pubsub)
 	lis, err := net.Listen("tcp", addr)

tipsd/server.go

@@ -35,6 +35,8 @@ func NewServer(conf *conf.Server, pubsub *tips.Tips) *Server {
 		cancel:     cancel,
 		router:     router,
 		pubsub:     pubsub,
+		certFile:   conf.Cert,
+		keyFile:    conf.Key,
 		httpServer: &http.Server{Handler: router},
 	}
 
@@ -66,8 +68,11 @@ func (s *Server) initRouter() {
 // Serve accepts incoming connections on the Listener l, creating a
 // new service goroutine for each.
 func (s *Server) Serve(lis net.Listener) error {
-	// return s.httpServer.ServeTLS(lis, s.certFile, s.keyFile)
 	s.initRouter()
+
+	if s.certFile != "" && s.keyFile != "" {
+		return s.httpServer.ServeTLS(lis, s.certFile, s.keyFile)
+	}
 	return s.httpServer.Serve(lis)
 }