From fa6e9540a895848c9f61b1df1d6209f31afa917b Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Wed, 24 Aug 2016 23:04:34 -0700
Subject: [PATCH] server: We shouldn't exit the server in lazy init. (#2548)

Avoid fatalIf instead these are non-critical errors,
continue running the server.

 - initializing bucket notifications
 - initializing bucket policies.
 - migrating bucket policies failure.

Fixes #2547
---
 cmd/bucket-policy.go  |  3 +++
 cmd/event-notifier.go | 24 ++++++++++++++++++++++++
 cmd/routers.go        |  8 ++++----
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/cmd/bucket-policy.go b/cmd/bucket-policy.go
index c2cc5f6ed..8beb362e4 100644
--- a/cmd/bucket-policy.go
+++ b/cmd/bucket-policy.go
@@ -100,10 +100,13 @@ func initBucketPolicies(objAPI ObjectLayer) error {
 		return err
 	}
 
+	// Populate global bucket collection.
 	globalBucketPolicies = &bucketPolicies{
 		rwMutex:             &sync.RWMutex{},
 		bucketPolicyConfigs: policies,
 	}
+
+	// Success.
 	return nil
 }
 
diff --git a/cmd/event-notifier.go b/cmd/event-notifier.go
index cef9e4438..e5ed987be 100644
--- a/cmd/event-notifier.go
+++ b/cmd/event-notifier.go
@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"encoding/xml"
 	"fmt"
+	"net"
 	"net/url"
 	"path"
 	"sync"
@@ -308,6 +309,14 @@ func loadAllQueueTargets() (map[string]*logrus.Logger, error) {
 		// Using accountID we can now initialize a new AMQP logrus instance.
 		amqpLog, err := newAMQPNotify(accountID)
 		if err != nil {
+			// Encapsulate network error to be more informative.
+			if _, ok := err.(net.Error); ok {
+				return nil, &net.OpError{
+					Op:  "Connecting to " + queueARN,
+					Net: "tcp",
+					Err: err,
+				}
+			}
 			return nil, err
 		}
 		queueTargets[queueARN] = amqpLog
@@ -327,6 +336,14 @@ func loadAllQueueTargets() (map[string]*logrus.Logger, error) {
 		// Using accountID we can now initialize a new Redis logrus instance.
 		redisLog, err := newRedisNotify(accountID)
 		if err != nil {
+			// Encapsulate network error to be more informative.
+			if _, ok := err.(net.Error); ok {
+				return nil, &net.OpError{
+					Op:  "Connecting to " + queueARN,
+					Net: "tcp",
+					Err: err,
+				}
+			}
 			return nil, err
 		}
 		queueTargets[queueARN] = redisLog
@@ -345,6 +362,13 @@ func loadAllQueueTargets() (map[string]*logrus.Logger, error) {
 		// Using accountID we can now initialize a new ElasticSearch logrus instance.
 		elasticLog, err := newElasticNotify(accountID)
 		if err != nil {
+			// Encapsulate network error to be more informative.
+			if _, ok := err.(net.Error); ok {
+				return nil, &net.OpError{
+					Op: "Connecting to " + queueARN, Net: "tcp",
+					Err: err,
+				}
+			}
 			return nil, err
 		}
 		queueTargets[queueARN] = elasticLog
diff --git a/cmd/routers.go b/cmd/routers.go
index ff64eaaf7..4537db085 100644
--- a/cmd/routers.go
+++ b/cmd/routers.go
@@ -61,10 +61,10 @@ func newObjectLayerFactory(disks, ignoredDisks []string) func() ObjectLayer {
 		}
 		// Migrate bucket policy from configDir to .minio.sys/buckets/
 		err = migrateBucketPolicyConfig(objAPI)
-		fatalIf(err, "Unable to migrate bucket policy from config directory")
+		errorIf(err, "Unable to migrate bucket policy from config directory")
 
 		err = cleanupOldBucketPolicyConfigs()
-		fatalIf(err, "Unable to clean up bucket policy from config directory.")
+		errorIf(err, "Unable to clean up bucket policy from config directory.")
 
 		// Register the callback that should be called when the process shuts down.
 		globalShutdownCBs.AddObjectLayerCB(func() errCode {
@@ -76,11 +76,11 @@ func newObjectLayerFactory(disks, ignoredDisks []string) func() ObjectLayer {
 
 		// Initialize a new event notifier.
 		err = initEventNotifier(objAPI)
-		fatalIf(err, "Unable to initialize event notification queue")
+		errorIf(err, "Unable to initialize event notification.")
 
 		// Initialize and load bucket policies.
 		err = initBucketPolicies(objAPI)
-		fatalIf(err, "Unable to load all bucket policies")
+		errorIf(err, "Unable to load all bucket policies.")
 
 		// Success.
 		return objAPI