stop listening changes in storage and flist Changes

Author: Eslam-Nawara

pkg/environment/config.go

@@ -39,14 +39,14 @@ type Config struct {
 	BinRepo       string   `json:"bin_repo"`
 	GeoipURLs     []string `json:"geoip_urls"`
 
-	FlistURL   string `json:"flist_url"`
-	V4FlistURL string `json:"v4_flist_url"`
+	// FlistURL   string `json:"flist_url"`
+	// V4FlistURL string `json:"v4_flist_url"`
 
 	HubURL   string `json:"hub_url"`
 	V4HubURL string `json:"v4_hub_url"`
 
-	HubStorage   string `json:"hub_storage"`
-	V4HubStorage string `json:"v4_hub_storage"`
+	// HubStorage   string `json:"hub_storage"`
+	// V4HubStorage string `json:"v4_hub_storage"`
 }
 
 // Merge, updates current config with cfg merging and override config

pkg/environment/environment.go

@@ -127,7 +127,6 @@ const (
 var (
 	pool    substrate.Manager
 	subURLs []string
-	// poolOnce sync.Once
 
 	envDev = Environment{
 		RunningMode: RunningDev,
@@ -330,7 +329,6 @@ func getEnvironmentFromParams(params kernel.Params) (Environment, error) {
 		env = envProd
 	}
 
-	// update it to read local config file instead of trying to download config over and over again
 	config, err := getConfig(env.RunningMode, baseExtendedURL, http.DefaultClient)
 	if err != nil {
 		// maybe the node can't reach the internet right now
@@ -377,13 +375,15 @@ func getEnvironmentFromParams(params kernel.Params) (Environment, error) {
 		env.GeoipURLs = geoip
 	}
 
-	if flist := config.FlistURL; len(flist) > 0 {
-		env.FlistURL = flist
-	}
-
-	if storage := config.HubStorage; len(storage) > 0 {
-		env.HubStorage = storage
-	}
+	// flist url and hub urls shouldn't listen to changes in config as long as we can't change it at run time.
+	// it would cause breakage in vmd that needs a reboot to be recovered.
+	// if flist := config.FlistURL; len(flist) > 0 {
+	// 	env.FlistURL = flist
+	// }
+	//
+	// if storage := config.HubStorage; len(storage) > 0 {
+	// 	env.HubStorage = storage
+	// }
 
 	if hub := config.HubURL; len(hub) > 0 {
 		env.HubURL = hub
@@ -397,14 +397,14 @@ func getEnvironmentFromParams(params kernel.Params) (Environment, error) {
 	// if the node running v4 chage urls to use v4 hub
 	if params.IsV4() {
 		env.FlistURL = defaultV4FlistURL
-		if flist := config.V4FlistURL; len(flist) > 0 {
-			env.FlistURL = flist
-		}
+		// if flist := config.V4FlistURL; len(flist) > 0 {
+		// 	env.FlistURL = flist
+		// }
 
 		env.HubStorage = defaultV4HubStorage
-		if storage := config.V4HubStorage; len(storage) > 0 {
-			env.HubStorage = storage
-		}
+		// if storage := config.V4HubStorage; len(storage) > 0 {
+		// 	env.HubStorage = storage
+		// }
 
 	}
 

pkg/events/events.go

@@ -179,6 +179,7 @@ func (e *Processor) subscribe(ctx context.Context) error {
 			newCL, NewMeta, err := e.sub.Raw()
 			if err != nil {
 				log.Debug().Err(err).Msg("failed to update substrate connection")
+				continue
 			}
 
 			// only update cl and mata after creating the new connection successfully