Add sighup, sigusr2 into trapping code, to trap signals for reloading configuration.

Need to still figure out a way of graceful restarts - gave facebookgo/httpdown a shot,
but it is not suitable.
This commit is contained in:
Harshavardhana
2015-07-05 21:35:03 -07:00
parent a74a2db8f0
commit ba0a5ed416
3 changed files with 52 additions and 13 deletions

View File

@@ -23,8 +23,9 @@ type DonutService struct{}
// DonutArgs collections of disks and name to initialize donut
type DonutArgs struct {
Name string
Disks []string
MaxSize int64
Name string
Disks []string
}
// Reply reply for successful or failed Set operation

View File

@@ -17,6 +17,7 @@
package server
import (
"crypto/tls"
"fmt"
"net"
"net/http"
@@ -37,6 +38,20 @@ func startAPI(errCh chan error, conf api.Config, apiHandler http.Handler) {
MaxHeaderBytes: 1 << 20,
}
if conf.TLS {
config := &tls.Config{}
if httpServer.TLSConfig != nil {
*config = *httpServer.TLSConfig
}
var err error
config.Certificates = make([]tls.Certificate, 1)
config.Certificates[0], err = tls.LoadX509KeyPair(conf.CertFile, conf.KeyFile)
if err != nil {
errCh <- iodine.New(err, nil)
}
}
host, port, err := net.SplitHostPort(conf.Address)
if err != nil {
errCh <- iodine.New(err, nil)
@@ -62,18 +77,16 @@ func startAPI(errCh chan error, conf api.Config, apiHandler http.Handler) {
}
}
}
switch {
default:
for _, host := range hosts {
for _, host := range hosts {
if conf.TLS {
fmt.Printf("Starting minio server on: https://%s:%s\n", host, port)
} else {
fmt.Printf("Starting minio server on: http://%s:%s\n", host, port)
}
errCh <- httpServer.ListenAndServe()
case conf.TLS == true:
for _, host := range hosts {
fmt.Printf("Starting minio server on: https://%s:%s\n", host, port)
}
errCh <- httpServer.ListenAndServeTLS(conf.CertFile, conf.KeyFile)
}
errCh <- httpServer.ListenAndServe()
}
// Start RPC listener
@@ -99,7 +112,7 @@ func startTM(a api.Minio) {
}
// StartServices starts basic services for a server
func StartServices(conf api.Config) error {
func StartServices(conf api.Config, doneCh chan struct{}) error {
apiErrCh := make(chan error)
rpcErrCh := make(chan error)
@@ -113,5 +126,7 @@ func StartServices(conf api.Config) error {
return iodine.New(err, nil)
case err := <-rpcErrCh:
return iodine.New(err, nil)
case <-doneCh:
return nil
}
}