Merge pull request #85 from mrajashree/readAndPull

Separate git pull from readCatalog
rancher · Oct 21, 2016 · b0e5882 · b0e5882
2 parents a8a44b0 + 659f289
commit b0e5882
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/manager/catalog.go b/manager/catalog.go
@@ -70,10 +70,6 @@ func (cat *Catalog) readCatalog() error {
 				log.Infof("Catalog loaded without errors")
 				os.Exit(0)
 			}
-			err := cat.pullCatalog()
-			if err != nil {
-				log.Errorf("Git pull for Catalog %v failing with error: %v ", cat.CatalogID, err)
-			}
 		} else {
 			//remove the existing repo
 			err := os.RemoveAll(CatalogRootDir + cat.CatalogID)

diff --git a/manager/catalog_manager.go b/manager/catalog_manager.go
@@ -224,6 +224,10 @@ func Init() {
 		catalog.readCatalog()
 	}
 
+	for _, catalog := range CatalogsCollection {
+		catalog.pullCatalog()
+	}
+
 	//start a background timer to pull from the Catalog periodically
 	startCatalogBackgroundPoll()
 }