Correct time on instrument server against time on main server

Author: d-j-hatton

src/murfey/client/multigrid_control.py

@@ -100,6 +100,15 @@ def __post_init__(self):
             register_client=False,
         )
 
+        if self.visit_end_time:
+            current_time = datetime.now()
+            server_timestamp = requests.get(f"{self.murfey_url}/time").json()[
+                "timestamp"
+            ]
+            self.visit_end_time += (
+                datetime.fromtimestamp(server_timestamp) - current_time
+            )
+
     def _multigrid_watcher_finalised(self):
         self.multigrid_watcher_active = False
         self.dormancy_check()

src/murfey/server/api/__init__.py

@@ -128,6 +128,11 @@ async def root(request: Request):
     )
 
 
+@router.get("/time")
+async def get_current_timestamp():
+    return {"timestamp": datetime.datetime.now().timestamp()}
+
+
 @router.get("/health/")
 def health_check(db=murfey.server.ispyb.DB):
     conn = db.connection()