From d23327143808d0e7740cb1e01ce120d7804f0042 Mon Sep 17 00:00:00 2001
From: CaptainOfHacks <39195263+CaptainOfHacks@users.noreply.github.com>
Date: Sat, 23 Dec 2023 12:57:03 +0200
Subject: [PATCH] change TimeoutError to OSError old exception

---
 .../task_manager/adapters/task_manager.py        | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/mapping_workbench/backend/task_manager/adapters/task_manager.py b/mapping_workbench/backend/task_manager/adapters/task_manager.py
index 041456744..2e240bdfe 100644
--- a/mapping_workbench/backend/task_manager/adapters/task_manager.py
+++ b/mapping_workbench/backend/task_manager/adapters/task_manager.py
@@ -1,4 +1,3 @@
-import socket
 from concurrent.futures import CancelledError
 from typing import List
 
@@ -19,12 +18,19 @@ def on_task_done_callback(future):
     except CancelledError:
         task.update_task_status(TaskStatus.CANCELED)
         task.update_exception_message("Task was canceled!")
-    except (socket.timeout, TimeoutError) as error:
-        task.update_task_status(TaskStatus.TIMEOUT)
-        task.update_exception_message(f"Task took longer than {error.args[1]} seconds")
+    except OSError as error:
+        if len(error.args) > 0:
+            if error.args[0] == "Task timeout":
+                task.update_task_status(TaskStatus.TIMEOUT)
+                task.update_exception_message(f"Task took longer than {task.task_metadata.task_timeout} seconds")
+        else:
+            task.update_task_status(TaskStatus.FAILED)
+            task.update_exception_message(
+                f"Task raised error: {str(error)}\n{error.__traceback__}, error_type={type(error)}")
     except Exception as error:
         task.update_task_status(TaskStatus.FAILED)
-        task.update_exception_message(f"Task raised error: {str(error)}\n{error.__traceback__}")
+        task.update_exception_message(
+            f"Task raised error: {str(error)}\n{error.__traceback__}, error_type={type(error)}")
 
 
 class TaskManager: