From 1814534973d4dad048a4a55400555579d7f3d729 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Thu, 20 Oct 2022 16:43:16 +0200 Subject: [PATCH] gfa-logstash does not exist any longer --- startup.script_common | 1 - startup.script_linux | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/startup.script_common b/startup.script_common index 06a9dac..65ea28c 100644 --- a/startup.script_common +++ b/startup.script_common @@ -94,7 +94,6 @@ require "utilities", getenv("utilities_VERSION") require "misc", getenv("misc_VERSION") # caPutLog -putenv "EPICS_CA_PUT_LOG_ADDR=gfa-syslog:1515 gfa-logstash:1515" require "caPutLog", getenv("caPutLog_VERSION")?getenv("caPutLog_VERSION"):"ifexists" # EPICS 3.13 needs this to not use synchronized timestamps diff --git a/startup.script_linux b/startup.script_linux index bfa0aea..1ce1a19 100644 --- a/startup.script_linux +++ b/startup.script_linux @@ -88,7 +88,7 @@ require iocStats $(iocStats_VERSION=ifexists) require iocinfo $(iocinfo_VERSION=ifexists) # caPutLog -epicsEnvSet EPICS_CA_PUT_LOG_ADDR, "gfa-syslog:1515 gfa-logstash.psi.ch:1515" +epicsEnvSet EPICS_CA_PUT_LOG_ADDR, "gfa-syslog:1515" # Set EPICS_CA_PUT_LOG_PREFIX for EPICS 3 but not for 7 because there we have iocLogPrefix epicsEnvSet EPICS_CA_PUT_LOG_PREFIX_CMD_3 "epicsEnvSet EPICS_CA_PUT_LOG_PREFIX $(IOC)" $(EPICS_CA_PUT_LOG_PREFIX_CMD_$(EPICS_VERSION_MAJOR=3)=)