Changed local variable name and added traceback for exthandler failur…

…es (#1392) * Changed local variable name and added traceback * Changing the traceback location
Azure · Nov 13, 2018 · 52cb1bb · 52cb1bb
1 parent df80d3b
commit 52cb1bb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/azurelinuxagent/common/protocol/wire.py b/azurelinuxagent/common/protocol/wire.py
@@ -766,39 +766,39 @@ def update_goal_state(self, forced=False, max_retry=3):
                                         INCARNATION_FILE_NAME)
         uri = GOAL_STATE_URI.format(self.endpoint)
 
-        goal_state = None
+        current_goal_state_from_configuration = None
         for retry in range(0, max_retry):
             try:
-                if goal_state is None:
+                if current_goal_state_from_configuration is None:
                     xml_text = self.fetch_config(uri, self.get_header())
-                    goal_state = GoalState(xml_text)
+                    current_goal_state_from_configuration = GoalState(xml_text)
 
                     if not forced:
                         last_incarnation = None
                         if os.path.isfile(incarnation_file):
                             last_incarnation = fileutil.read_file(
                                                     incarnation_file)
-                        new_incarnation = goal_state.incarnation
+                        new_incarnation = current_goal_state_from_configuration.incarnation
                         if last_incarnation is not None and \
                                         last_incarnation == new_incarnation:
                             # Goalstate is not updated.
                             return                
                 self.goal_state_flusher.flush(datetime.utcnow())
 
-                self.goal_state = goal_state
-                file_name = GOAL_STATE_FILE_NAME.format(goal_state.incarnation)
+                self.goal_state = current_goal_state_from_configuration
+                file_name = GOAL_STATE_FILE_NAME.format(current_goal_state_from_configuration.incarnation)
                 goal_state_file = os.path.join(conf.get_lib_dir(), file_name)
                 self.save_cache(goal_state_file, xml_text)
-                self.update_hosting_env(goal_state)
-                self.update_shared_conf(goal_state)
-                self.update_certs(goal_state)
-                self.update_ext_conf(goal_state)
-                self.update_remote_access_conf(goal_state)
-                self.save_cache(incarnation_file, goal_state.incarnation)
+                self.update_hosting_env(current_goal_state_from_configuration)
+                self.update_shared_conf(current_goal_state_from_configuration)
+                self.update_certs(current_goal_state_from_configuration)
+                self.update_ext_conf(current_goal_state_from_configuration)
+                self.update_remote_access_conf(current_goal_state_from_configuration)
+                self.save_cache(incarnation_file, current_goal_state_from_configuration.incarnation)
 
                 if self.host_plugin is not None:
-                    self.host_plugin.container_id = goal_state.container_id
-                    self.host_plugin.role_config_name = goal_state.role_config_name
+                    self.host_plugin.container_id = current_goal_state_from_configuration.container_id
+                    self.host_plugin.role_config_name = current_goal_state_from_configuration.role_config_name
 
                 return
 
@@ -807,7 +807,7 @@ def update_goal_state(self, forced=False, max_retry=3):
 
             except ResourceGoneError:
                 logger.info("Goal state is stale, re-fetching")
-                goal_state = None
+                current_goal_state_from_configuration = None
 
             except ProtocolError as e:
                 if retry < max_retry - 1:

diff --git a/azurelinuxagent/ga/exthandlers.py b/azurelinuxagent/ga/exthandlers.py
@@ -204,7 +204,7 @@ def run(self):
             self.get_artifact_error_state.reset()
         except Exception as e:
             msg = u"Exception retrieving extension handlers: {0}".format(ustr(e))
-            detailed_msg = '{0} {1}'.format(msg, traceback.format_exc())
+            detailed_msg = '{0} {1}'.format(msg, traceback.print_tb(e.__traceback__))
 
             self.get_artifact_error_state.incr()