Browse code

Don't fail to start daemon if builder source is not available

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2018/06/14 01:33:19
Showing 1 changed files
... ...
@@ -37,6 +37,7 @@ import (
37 37
 	digest "github.com/opencontainers/go-digest"
38 38
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
39 39
 	"github.com/pkg/errors"
40
+	"github.com/sirupsen/logrus"
40 41
 )
41 42
 
42 43
 // Opt defines a structure for creating a worker.
... ...
@@ -77,32 +78,33 @@ func NewWorker(opt Opt) (*Worker, error) {
77 77
 		CacheAccessor: cm,
78 78
 		MetadataStore: opt.MetadataStore,
79 79
 	})
80
-	if err != nil {
81
-		return nil, err
80
+	if err == nil {
81
+		sm.Register(gs)
82
+	} else {
83
+		logrus.Warnf("Could not register builder git source: %s", err)
82 84
 	}
83 85
 
84
-	sm.Register(gs)
85
-
86 86
 	hs, err := http.NewSource(http.Opt{
87 87
 		CacheAccessor: cm,
88 88
 		MetadataStore: opt.MetadataStore,
89 89
 		Transport:     opt.Transport,
90 90
 	})
91
-	if err != nil {
92
-		return nil, err
91
+	if err == nil {
92
+		sm.Register(hs)
93
+	} else {
94
+		logrus.Warnf("Could not register builder http source: %s", err)
93 95
 	}
94 96
 
95
-	sm.Register(hs)
96
-
97 97
 	ss, err := local.NewSource(local.Opt{
98 98
 		SessionManager: opt.SessionManager,
99 99
 		CacheAccessor:  cm,
100 100
 		MetadataStore:  opt.MetadataStore,
101 101
 	})
102
-	if err != nil {
103
-		return nil, err
102
+	if err == nil {
103
+		sm.Register(ss)
104
+	} else {
105
+		logrus.Warnf("Could not register builder local source: %s", err)
104 106
 	}
105
-	sm.Register(ss)
106 107
 
107 108
 	return &Worker{
108 109
 		Opt:           opt,