switch to new log server

This commit is contained in:
2025-07-09 11:40:30 +02:00
parent 6d3d7135b1
commit 15dbee47a6
2 changed files with 4 additions and 3 deletions

View File

@@ -51,7 +51,7 @@ dbBptNotMonotonic=1
dbQuietMacroWarnings=1
# Start Logging
putenv getenv("EPICS_IOC_LOG_INET") ? "" : "EPICS_IOC_LOG_INET=gfa-syslog"
putenv getenv("EPICS_IOC_LOG_INET") ? "" : "EPICS_IOC_LOG_INET=gfa-syslog-03"
putenv getenv("EPICS_IOC_LOG_PORT") ? "" : "EPICS_IOC_LOG_PORT=1514"
sprintf STRINGBUFFER, "%s ", IOC
iocLogPrefix STRINGBUFFER
@@ -78,6 +78,7 @@ require "utilities", getenv("utilities_VERSION")
require "misc", getenv("misc_VERSION")
# caPutLog
putenv "EPICS_CA_PUT_LOG_ADDR=gfa-syslog-03:1515"
require "caPutLog", getenv("caPutLog_VERSION") ? getenv("caPutLog_VERSION") : "ifexists"
# Run Channel Access only on 1st network port

View File

@@ -5,7 +5,7 @@ epicsEnvSet EPICS R$(EPICS_RELEASE=$(BASE=3.14.12))
date 'epicsEnvSet IOC_STARTTIME "%Y-%m-%dT%H:%M:%S"' > /tmp/$(IOC).starttime
< /tmp/$(IOC).starttime
system "rm /tmp/$(IOC).starttime"
epicsEnvSet EPICS_IOC_LOG_INET $(EPICS_IOC_LOG_INET=gfa-syslog)
epicsEnvSet EPICS_IOC_LOG_INET $(EPICS_IOC_LOG_INET=gfa-syslog-03)
epicsEnvSet EPICS_IOC_LOG_PORT $(EPICS_IOC_LOG_PORT=1514)
# iocLogPrefix will fail for EPICS 3 but that's OK
@@ -88,7 +88,7 @@ require iocStats $(iocStats_VERSION=ifexists)
require iocinfo $(iocinfo_VERSION=ifexists)
# caPutLog
epicsEnvSet EPICS_CA_PUT_LOG_ADDR, "gfa-syslog:1515"
epicsEnvSet EPICS_CA_PUT_LOG_ADDR, "gfa-syslog-03: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)=)