Skip to content

Commit f6a030b

Browse files
committed
Get number of skipped files when collecting rsyncer information
1 parent 02ccd47 commit f6a030b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/murfey/instrument_server/api.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ def setup_multigrid_watcher(
161161
data_collection_parameters=data_collection_parameters.get(label, {}),
162162
rsync_restarts=watcher_spec.rsync_restarts,
163163
visit_end_time=watcher_spec.visit_end_time,
164-
end_time_grace_period=watcher_spec.grace_period,
165164
)
166165
watcher_spec.source.mkdir(exist_ok=True)
167166
machine_config = requests.get(
@@ -253,6 +252,7 @@ class ObserverInfo(BaseModel):
253252
num_files_in_queue: int
254253
alive: bool
255254
stopping: bool
255+
num_files_skipped: int = 0
256256

257257

258258
@router.get("/sessions/{session_id}/rsyncer_info")
@@ -266,6 +266,7 @@ def get_rsyncer_info(session_id: MurfeySessionID) -> list[ObserverInfo]:
266266
num_files_in_queue=v.queue.qsize(),
267267
alive=v.thread.is_alive(),
268268
stopping=v._stopping,
269+
num_files_skipped=len(v._skipped_files),
269270
)
270271
)
271272
return info

src/murfey/server/api/instrument.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,7 @@ class RSyncerInfo(BaseModel):
487487
files_counted: int
488488
transferring: bool
489489
session_id: int
490+
num_files_skipped: int = 0
490491

491492

492493
@router.get("/instruments/{instrument_name}/sessions/{session_id}/rsyncer_info")
@@ -564,6 +565,7 @@ async def get_rsyncer_info(
564565
files_counted=ri.files_counted,
565566
transferring=ri.transferring,
566567
session_id=session_id,
568+
num_files_skipped=rsync_data.get("num_files_skipped", 0),
567569
)
568570
)
569571
return combined_data

0 commit comments

Comments
 (0)