Move initGracefulShutdown before objectLayer initialization (#2468)

master
Krishnan Parthasarathi 8 years ago committed by Harshavardhana
parent 7c7eb1475d
commit a4691611a7
  1. 8
      cmd/routers.go

@ -65,10 +65,6 @@ func newObjectLayerFactory(disks, ignoredDisks []string) func() ObjectLayer {
err = cleanupOldBucketPolicyConfigs() err = cleanupOldBucketPolicyConfigs()
fatalIf(err, "Unable to clean up bucket policy from config directory.") fatalIf(err, "Unable to clean up bucket policy from config directory.")
// Initialize and monitor shutdown signals.
err = initGracefulShutdown(os.Exit)
fatalIf(err, "Unable to initialize graceful shutdown operation")
// Register the callback that should be called when the process shuts down. // Register the callback that should be called when the process shuts down.
globalShutdownCBs.AddObjectLayerCB(func() errCode { globalShutdownCBs.AddObjectLayerCB(func() errCode {
if sErr := objAPI.Shutdown(); sErr != nil { if sErr := objAPI.Shutdown(); sErr != nil {
@ -95,6 +91,10 @@ func configureServerHandler(srvCmdConfig serverCmdConfig) http.Handler {
storageRPCs, err := newRPCServer(srvCmdConfig) storageRPCs, err := newRPCServer(srvCmdConfig)
fatalIf(err, "Unable to initialize storage RPC server.") fatalIf(err, "Unable to initialize storage RPC server.")
// Initialize and monitor shutdown signals.
err = initGracefulShutdown(os.Exit)
fatalIf(err, "Unable to initialize graceful shutdown operation")
newObjectLayerFn := newObjectLayerFactory(srvCmdConfig.disks, srvCmdConfig.ignoredDisks) newObjectLayerFn := newObjectLayerFactory(srvCmdConfig.disks, srvCmdConfig.ignoredDisks)
// Initialize API. // Initialize API.
apiHandlers := objectAPIHandlers{ apiHandlers := objectAPIHandlers{

Loading…
Cancel
Save