Skip to content

Commit cbdc412

Browse files
authored
Remove decorator for recording method call failures (#393)
record_failure decorator was broken. Looks like we can just remove it
1 parent 2592b6b commit cbdc412

File tree

1 file changed

+2
-26
lines changed

1 file changed

+2
-26
lines changed

src/murfey/server/__init__.py

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import subprocess
88
import time
99
from datetime import datetime
10-
from functools import partial, singledispatch, wraps
10+
from functools import partial, singledispatch
1111
from pathlib import Path
1212
from threading import Thread
13-
from typing import Any, Callable, Dict, List, NamedTuple, Tuple
13+
from typing import Any, Dict, List, NamedTuple, Tuple
1414

1515
import mrcfile
1616
import numpy as np
@@ -96,28 +96,6 @@ class JobIDs(NamedTuple):
9696
client_id: int
9797

9898

99-
def record_failure(
100-
f: Callable, record_queue: str = "", is_callback: bool = True
101-
) -> Callable:
102-
@wraps(f)
103-
def wrapper(*args, **kwargs):
104-
try:
105-
return f(*args, **kwargs)
106-
except Exception:
107-
logger.warning(f"Call to {f} failed", exc_info=True)
108-
if _transport_object and is_callback:
109-
if not record_queue:
110-
machine_config = get_machine_config()
111-
record_queue = (
112-
machine_config.failure_queue
113-
or f"dlq.{_transport_object.feedback_queue}"
114-
)
115-
_transport_object.send(record_queue, args[0], new_connection=True)
116-
return None
117-
118-
return wrapper
119-
120-
12199
def sanitise(in_string: str) -> str:
122100
return in_string.replace("\r\n", "").replace("\n", "")
123101

@@ -1935,7 +1913,6 @@ def _register_initial_model(message: dict, _db=murfey_db, demo: bool = False):
19351913
_db.close()
19361914

19371915

1938-
@record_failure
19391916
def _flush_spa_preprocessing(message: dict):
19401917
session_id = message["session_id"]
19411918
stashed_files = murfey_db.exec(
@@ -2045,7 +2022,6 @@ def _flush_spa_preprocessing(message: dict):
20452022
return None
20462023

20472024

2048-
@record_failure
20492025
def _flush_tomography_preprocessing(message: dict):
20502026
session_id = message["session_id"]
20512027
instrument_name = (

0 commit comments

Comments
 (0)