Skip to content

Commit

Permalink
The following changes were made:
Browse files Browse the repository at this point in the history
1) pvaClientChannel no longer issues an error message on disconnect.
   This should never have been done.
   When pvaClient is used within a database, it caused error mesaage when database exits.
2) pvaClientGet,Monitor,Process,Put,PutGet now let pvaClientChannel handle getRequesterName and message.
   This leads to better error messages.
  • Loading branch information
mrkraimer committed Mar 15, 2021
1 parent 3fb934a commit 6eb977a
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 35 deletions.
3 changes: 0 additions & 3 deletions src/pvaClientChannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,6 @@ void PvaClientChannel::channelStateChange(
if(connectState==connectActive) waitingForConnect = true;
if(connectionState!=Channel::CONNECTED) {
Lock xx(mutex);
string mess(channelName +
" connection state " + Channel::ConnectionStateNames[connectionState]);
message(mess,errorMessage);
connectState = notConnected;
} else {
Lock xx(mutex);
Expand Down
9 changes: 2 additions & 7 deletions src/pvaClientGet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,19 +134,14 @@ void PvaClientGet::checkConnectState()
}
}

// from ChannelGetRequester
string PvaClientGet::getRequesterName()
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) return string("PvaClientGet::getRequesterName PvaClient isDestroyed");
return yyy->getRequesterName();
return pvaClientChannel->getRequesterName();
}

void PvaClientGet::message(string const & message,MessageType messageType)
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) return;
yyy->message(message, messageType);
pvaClientChannel->message(message,messageType);
}

void PvaClientGet::channelGetConnect(
Expand Down
8 changes: 2 additions & 6 deletions src/pvaClientMonitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,16 +201,12 @@ void PvaClientMonitor::checkMonitorState()

string PvaClientMonitor::getRequesterName()
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) return string("PvaClientMonitor::getRequesterName() PvaClient isDestroyed");
return yyy->getRequesterName();
return pvaClientChannel->getRequesterName();
}

void PvaClientMonitor::message(string const & message,MessageType messageType)
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) return;
yyy->message(message, messageType);
pvaClientChannel->message(message,messageType);
}

void PvaClientMonitor::monitorConnect(
Expand Down
9 changes: 2 additions & 7 deletions src/pvaClientProcess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,14 @@ PvaClientProcess::~PvaClientProcess()
}
}

// from ChannelProcessRequester
string PvaClientProcess::getRequesterName()
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) throw std::runtime_error("pvaClient was destroyed");
return yyy->getRequesterName();
return pvaClientChannel->getRequesterName();
}

void PvaClientProcess::message(string const & message,MessageType messageType)
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) throw std::runtime_error("pvaClient was destroyed");
yyy->message(message, messageType);
pvaClientChannel->message(message,messageType);
}

void PvaClientProcess::channelProcessConnect(
Expand Down
8 changes: 2 additions & 6 deletions src/pvaClientPut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,12 @@ void PvaClientPut::checkConnectState()

string PvaClientPut::getRequesterName()
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) return string("PvaClientPut::getRequesterName() PvaClient isDestroyed");
return yyy->getRequesterName();
return pvaClientChannel->getRequesterName();
}

void PvaClientPut::message(string const & message,MessageType messageType)
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) return;
yyy->message(message, messageType);
pvaClientChannel->message(message,messageType);
}

void PvaClientPut::channelPutConnect(
Expand Down
8 changes: 2 additions & 6 deletions src/pvaClientPutGet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,12 @@ void PvaClientPutGet::checkPutGetState()

string PvaClientPutGet::getRequesterName()
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) return string("PvaClientPutGet::getRequesterName() PvaClient isDestroyed");
return yyy->getRequesterName();
return pvaClientChannel->getRequesterName();
}

void PvaClientPutGet::message(string const & message,MessageType messageType)
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) return;
yyy->message(message, messageType);
pvaClientChannel->message(message,messageType);
}

void PvaClientPutGet::channelPutGetConnect(
Expand Down

0 comments on commit 6eb977a

Please sign in to comment.