info livesim messages fix (#436)

Signed-off-by: Shmulik Froimovich <[email protected]>

Author: shmfr

nca/NetworkConfig/ResourcesHandler.py

@@ -99,9 +99,6 @@ def analyze_livesim(policy_finder):
         """
         livesim_configuration_addons = []
 
-        # stop collecting messages when pre-processing and analyzing livesim yaml files.
-        NcaLogger().dont_collect_msgs()
-
         # find kube-dns reference
         dns_added_resources = ResourcesHandler.get_relevant_livesim_resources_paths_by_labels_matching(
             LiveSimPaths.DnsCfgPath, policy_finder.missing_dns_pods_with_labels)
@@ -122,7 +119,6 @@ def analyze_livesim(policy_finder):
             livesim_configuration_addons += istio_gateway_added_resources
             ResourcesHandler.livesim_information_message('Istio-ingress-gateway')
 
-        NcaLogger().collect_msgs()
         return livesim_configuration_addons
 
     def parse_elements(self, ns_list, pod_list, resource_list, config_name, save_flag, np_list):
@@ -171,9 +167,9 @@ def get_network_config(self, np_list, ns_list, pod_list, resource_list, config_n
                                                                     save_flag,
                                                                     np_list
                                                                     )
+        NcaLogger().unmute()
         # check if LiveSim can add anything.
         livesim_addons = self.analyze_livesim(resources_parser.policies_finder)
-        NcaLogger().unmute()
         if livesim_addons:
             NcaLogger().flush_messages(silent=True)
             if ns_list:
@@ -364,6 +360,8 @@ def parse_livesim_yamls(path):
         yaml_files = resource_scanner.get_yamls()
 
         results = {}
+        # stop collecting messages when pre-processing and analyzing livesim yaml files.
+        NcaLogger().dont_collect_msgs()
         for yaml_file in yaml_files:
             pods_finder = PodsFinder()
             ns_finder = NamespacesFinder()
@@ -377,6 +375,7 @@ def parse_livesim_yamls(path):
             for item in pods_finder.peer_set:
                 labels_found.update(item.labels)
             results.update({yaml_file.path: labels_found})
+        NcaLogger().collect_msgs()
 
         return results
 

nca/Utils/NcaLogger.py

@@ -97,11 +97,11 @@ def log_message(self, msg, file=None, level=None):
             if not file:
                 file = sys.stderr
 
-        if self.is_mute():
-            if self._is_collecting_msgs:
+        if self._is_collecting_msgs:
+            if self.is_mute():
                 self._collected_messages.append(msg)
-        else:
-            print(msg, file=file)
+            else:
+                print(msg, file=file)
 
     def flush_messages(self, silent=False):
         """