Merge branch 'master' into 9369-arv-cwl-docs

[arvados.git] / services / nodemanager / arvnodeman / nodelist.py

diff --git a/services/nodemanager/arvnodeman/nodelist.py b/services/nodemanager/arvnodeman/nodelist.py
index 7ddfb7ca33e8b97f8132117c66789529415d8b90..f1a661e559247e263a10acdd3eea1271f282bc58 100644 (file)
--- a/services/nodemanager/arvnodeman/nodelist.py
+++ b/services/nodemanager/arvnodeman/nodelist.py
@@ -12,8 +12,8 @@ class ArvadosNodeListMonitorActor(clientactor.RemotePollLoopActor):
     sends it to subscribers.
     """
 
-    CLIENT_ERRORS = config.ARVADOS_ERRORS
-    LOGGER_NAME = 'arvnodeman.arvados_nodes'
+    def is_common_error(self, exception):
+        return isinstance(exception, config.ARVADOS_ERRORS)
 
     def _item_key(self, node):
         return node['uuid']
@@ -29,11 +29,12 @@ class CloudNodeListMonitorActor(clientactor.RemotePollLoopActor):
     nodes, and sends it to subscribers.
     """
 
-    CLIENT_ERRORS = config.CLOUD_ERRORS
-    LOGGER_NAME = 'arvnodeman.cloud_nodes'
+    def is_common_error(self, exception):
+        return self._client.is_cloud_exception(exception)
 
     def _item_key(self, node):
         return node.id
 
     def _send_request(self):
-        return self._client.list_nodes()
+        n = self._client.list_nodes()
+        return n