formatting fixed, better error handling

server_apps.go

@@ -453,6 +453,27 @@ func (s *server) getAppInfo(ctx context.Context, pathInRepo, repo string, slug *
 	return app, nil
 }
 
+func getFlags(obj *object.Commit) (*map[string]interface{}, error){
+	flags, err := obj.File("tags.json")
+	if err != nil {
+		return nil, err
+	} 
+	flagreader, err := flags.Reader()
+	if err != nil {
+		return nil, err
+	}
+	flagbytes, err := io.ReadAll(flagreader)
+	if err != nil {
+		return nil, err
+	}
+	var flagmap map[string]interface{}
+	err = json.Unmarshal([]byte(flagbytes), &flagmap)
+	if err != nil {
+		return nil, err
+	}
+	return &flagmap, nil
+}
+
 func (s *server) getAppRegistry(ctx context.Context) (*appRegistry, error) {
 	s.gitMu.Lock()
 	defer s.gitMu.Unlock()
@@ -483,29 +504,15 @@ func (s *server) getAppRegistry(ctx context.Context) (*appRegistry, error) {
 	if err != nil {
 		return nil, err
 	}
-    flags, err := obj.File("tags.json")
-	if err != nil {
-		return nil, err
-	}
-    flagreader, err := flags.Reader()
-	if err != nil {
-		return nil, err
-	}
-    flagbytes, err := io.ReadAll(flagreader)
-	if err != nil {
-		return nil, err
-	}
-
-    var flagmap map[string]interface{}
 
-    err = json.Unmarshal([]byte(flagbytes), &flagmap)
+	iter, err := obj.Files()
 	if err != nil {
 		return nil, err
 	}
 
-	iter, err := obj.Files()
+	flagmap, err := getFlags(obj)
 	if err != nil {
-		return nil, err
+		log.Printf("flags.json: couldn't read: %v", err)
 	}
 
 	var registry appRegistry
@@ -565,8 +572,10 @@ func (s *server) getAppRegistry(ctx context.Context) (*appRegistry, error) {
 	}
 
 	for _, app := range registry.apps {
+		printed := false
 		info, err := s.getAppInfo(ctx, app.pathInRepo, app.repository, nil)
 		if err != nil {
+			printed = true
 			log.Printf("App %q: %v", app.repository, err)
 			registry.shame = append(registry.shame, &appShame{
 				repository: app.repository,
@@ -574,14 +583,15 @@ func (s *server) getAppRegistry(ctx context.Context) (*appRegistry, error) {
 			})
 			continue
 		} else if info.firstErr != nil {
+			printed = true
 			log.Printf("App: %q: was okay, latest has error: %v", app.repository, info.firstErr)
 			registry.shame = append(registry.shame, &appShame{
 				repository: app.repository,
 				errorMsg:   fmt.Sprintf("%v", info.firstErr),
 			})
-		} else if app_flags, ok := flagmap[app.repository].(map[string]interface{}); ok {
+		} else if flagmap != nil {
+			if app_flags, ok := (*flagmap)[app.repository].(map[string]interface{}); ok{
 				info.status = new(appStatus)
-            printed := false
 				if tags, ok := app_flags["tags"].([]interface{}); ok {
 					for _, tag := range tags{
 						if tagtxt, ok := tag.(string); ok {
@@ -611,10 +621,9 @@ func (s *server) getAppRegistry(ctx context.Context) (*appRegistry, error) {
 						}
 					}
 				}
-            if !printed{
-			    log.Printf("App: %q: okay", app.repository)
 			}
-		} else {
+		}
+		if !printed{
 			log.Printf("App: %q: okay", app.repository)
 		}
 		app.appInfo = info