Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add ability to run with specified TLS Cert and Key files #42

Merged
merged 1 commit into from
Apr 18, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkg/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,15 @@ func (s *Server) RunTLS(ctx context.Context, addr string, cert string, key strin
return s.run(ctx, addr, listenAndServe)
}

// RunTLSWithTLSFiles creates the HTTPS handler based on the certification
// files that were passed and begins to listen on the specified address.
func (s *Server) RunTLSWithTLSFiles(ctx context.Context, addr string, certFilePath string, keyFilePath string) error {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

listenAndServe := func(srv *http.Server) error {
return srv.ListenAndServeTLS(certFilePath, keyFilePath)
}
return s.run(ctx, addr, listenAndServe)
}

func (s *Server) run(ctx context.Context, addr string, listenAndServe func(srv *http.Server) error) error {
glog.Infof("Starting server on %s\n", addr)
srv := &http.Server{
Expand Down