[RSDK-11750] Improved error handling when removing modular resource (#989)

Author: njooma

src/viam/module/module.py

@@ -258,10 +258,13 @@ async def remove_resource(self, request: RemoveResourceRequest):
         rn = resource_name_from_string(request.name)
         resource = self.server.get_resource(ResourceBase, rn)
         if isinstance(resource, Stoppable):
-            if iscoroutinefunction(resource.stop):
-                await resource.stop()
-            else:
-                resource.stop()
+            try:
+                if iscoroutinefunction(resource.stop):
+                    await resource.stop()
+                else:
+                    resource.stop()
+            except Exception as e:
+                self.logger.warning(f"Could not remove resource named {resource.name}", exc_info=e)
         await self.server.remove_resource(rn)
 
     async def ready(self, request: ReadyRequest) -> ReadyResponse:

src/viam/resource/manager.py

@@ -103,10 +103,11 @@ async def remove_resource(self, name: ResourceName):
             try:
                 resource = self.resources[name]
                 await resource.close()
-            except Exception as e:
-                raise e
             finally:
-                del self.resources[name]
+                try:
+                    del self.resources[name]
+                except KeyError:
+                    pass
 
     async def close(self):
         """Close the resourcce manager by removing all resources.