Add cluster cleanup for all exit() calls

Signed-off-by: Nadia Pinaeva <[email protected]>

sos/collector/__init__.py

@@ -443,6 +443,7 @@ def add_parser_options(cls, parser):
 
     def exit(self, msg, error=1):
         """Used to safely terminate if sos-collector encounters an error"""
+        self.cluster.cleanup()
         self.log_error(msg)
         try:
             self.close_all_connections()
@@ -854,7 +855,6 @@ def display_nodes(self):
                       "CTRL-C to quit\n")
                 self.ui_log.info("")
             except KeyboardInterrupt:
-                self.cluster.cleanup()
                 self.exit("Exiting on user cancel", 130)
             except Exception as e:
                 self.exit(repr(e), 1)
@@ -1185,7 +1185,6 @@ def collect(self):
             arc_name = self.create_cluster_archive()
         else:
             msg = 'No sosreports were collected, nothing to archive...'
-            self.cluster.cleanup()
             self.exit(msg, 1)
 
         if self.opts.upload and self.policy.get_upload_url():