From e09506c2bb97ef1ecf91af788eb1592a10252b91 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 6 Jul 2018 17:02:34 +0200 Subject: [PATCH] always enable error messages when loading protocol files --- src/StreamEpics.cc | 6 ++++++ src/StreamError.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/StreamEpics.cc b/src/StreamEpics.cc index 6c2610b..1f5261f 100644 --- a/src/StreamEpics.cc +++ b/src/StreamEpics.cc @@ -196,8 +196,12 @@ extern "C" long streamReload(char* recordname) dbCommon* record; long status; + int oldStreamError = streamError; + streamError = 1; + if(!pdbbase) { error("No database has been loaded\n"); + streamError = oldStreamError; return ERROR; } debug("streamReload(%s)\n", recordname); @@ -234,6 +238,7 @@ extern "C" long streamReload(char* recordname) } dbFinishEntry(&dbentry); StreamProtocolParser::free(); + streamError = oldStreamError; return OK; } @@ -408,6 +413,7 @@ long streamInit(int after) { if (after) { + streamError = 0; // Switch off errors after init in order not to spam messages when a device is down. StreamProtocolParser::free(); } return OK; diff --git a/src/StreamError.cc b/src/StreamError.cc index e5d38d1..5ba0832 100644 --- a/src/StreamError.cc +++ b/src/StreamError.cc @@ -23,7 +23,7 @@ #include int streamDebug = 0; -int streamError = 0; +int streamError = 1; extern "C" { #ifdef _WIN32 __declspec(dllexport)