Setup logging to graylog for instrument server via main server

d-j-hatton · d-j-hatton · commit 92d17f08210e · 2025-03-19T13:25:23.000Z
diff --git a/src/murfey/instrument_server/__init__.py b/src/murfey/instrument_server/__init__.py
@@ -37,7 +37,10 @@ def run():
 
     ws = murfey.client.websocket.WSApp(
         server=read_config()["Murfey"].get("server"),
+<<<<<<< HEAD
         id=0,
+=======
+>>>>>>> 64e4467 (Setup logging to graylog for instrument server via main server)
     )
 
     handler = CustomHandler(ws.send)

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,10 @@ def run():`
`37`	`37`
`38`	`38`	`ws = murfey.client.websocket.WSApp(`
`39`	`39`	`server=read_config()["Murfey"].get("server"),`
	`40`	`+<<<<<<< HEAD`
`40`	`41`	`id=0,`
	`42`	`+=======`
	`43`	`+>>>>>>> 64e4467 (Setup logging to graylog for instrument server via main server)`
`41`	`44`	`)`
`42`	`45`
`43`	`46`	`handler = CustomHandler(ws.send)`