From 784a5f815fe54689552b04ea4d6b5dc7bb9caaf1 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 30 Oct 2002 00:35:31 +0000 Subject: [PATCH] improved message --- src/ca/tcpRecvWatchdog.cpp | 11 +++++++---- src/ca/tcpSendWatchdog.cpp | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/ca/tcpRecvWatchdog.cpp b/src/ca/tcpRecvWatchdog.cpp index 0c86def31..037828b0d 100644 --- a/src/ca/tcpRecvWatchdog.cpp +++ b/src/ca/tcpRecvWatchdog.cpp @@ -45,10 +45,13 @@ epicsTimerNotify::expireStatus tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ ) // X aCC 361 { if ( this->responsePending ) { - if ( this->iiu.bytesArePendingInOS() ) { - this->cacRef.printf ( -"Warning: non-preemptive CA client application has incoming messages pending, but it does not called ca_pend_event()\n" ); - return expireStatus ( restart, this->period ); + if ( ! this->cacRef.preemptiveCallbakIsEnabled() ) { + if ( this->iiu.bytesArePendingInOS() ) { + this->cacRef.printf ( + "The CA client is disconnecting because a CA server isnt responding " + "when there are incoming messages pending probably because the " + "application isnt calling ca_pend_event().\n" ); + } } this->cancel (); # ifdef DEBUG diff --git a/src/ca/tcpSendWatchdog.cpp b/src/ca/tcpSendWatchdog.cpp index 04a60946c..d893e4f38 100644 --- a/src/ca/tcpSendWatchdog.cpp +++ b/src/ca/tcpSendWatchdog.cpp @@ -43,8 +43,9 @@ epicsTimerNotify::expireStatus tcpSendWatchdog::expire ( if ( ! this->cacRef.preemptiveCallbakIsEnabled() ) { if ( this->iiu.bytesArePendingInOS() ) { this->cacRef.printf ( - "Warning: non-preemptive CA application has send data pending but it has not called ca_pend_event()\n" ); - return expireStatus ( restart, this->period ); + "The CA client is disconnecting after a flush request timed out, " + "but receive data is pending, probably because the non-preemptive" + "mode application isnt calling ca_pend_event()\n" ); } } # ifdef DEBUG