epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

EPICS_PVA_DEBUG from bool to int

Browse Source
This commit is contained in:
Matej Sekoranja
2014-05-23 13:36:21 +02:00
parent 6b388a572e
commit 0988f0c8fb
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pvAccessApp/remote/abstractResponseHandler.cpp
View File

@@ -24,7 +24,7 @@ namespace epics {
void AbstractResponseHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer const & /*transport*/, int8 version, int8 command,
size_t payloadSize, ByteBuffer* payloadBuffer) {
if(_debug) {
if(_debugLevel >= 3) { // TODO make a constant of sth (0 - off, 1 - debug, 2 - more/trace, 3 - messages)
char ipAddrStr[48];
ipAddrToDottedIP(&responseFrom->ia, ipAddrStr, sizeof(ipAddrStr));

4
pvAccessApp/remote/remote.h
View File

@@ -352,7 +352,7 @@ namespace epics {
*/
AbstractResponseHandler(Context* context, epics::pvData::String description) :
_description(description),
_debug(context->getConfiguration()->getPropertyAsBoolean(PVACCESS_DEBUG, false)) {
_debugLevel(context->getConfiguration()->getPropertyAsInteger(PVACCESS_DEBUG, 0)) {
}
virtual ~AbstractResponseHandler() {}
@@ -370,7 +370,7 @@ namespace epics {
/**
* Debug flag.
*/
bool _debug;
epics::pvData::int32 _debugLevel;
};
/**

6
pvAccessApp/remoteClient/clientContextImpl.cpp
View File

@@ -4037,6 +4037,12 @@ TODO
private:
void loadConfiguration() {
// TODO for now just a simple switch
int32 debugLevel = m_configuration->getPropertyAsInteger(PVACCESS_DEBUG, 0);
if (debugLevel > 0)
SET_LOG_LEVEL(logLevelDebug);
m_addressList = m_configuration->getPropertyAsString("EPICS_PVA_ADDR_LIST", m_addressList);
m_autoAddressList = m_configuration->getPropertyAsBoolean("EPICS_PVA_AUTO_ADDR_LIST", m_autoAddressList);
m_connectionTimeout = m_configuration->getPropertyAsFloat("EPICS_PVA_CONN_TMO", m_connectionTimeout);

5
pvAccessApp/server/serverContext.cpp
View File

@@ -98,6 +98,11 @@ void ServerContextImpl::loadConfiguration()
{
Configuration::shared_pointer config = getConfiguration();
// TODO for now just a simple switch
int32 debugLevel = config->getPropertyAsInteger(PVACCESS_DEBUG, 0);
if (debugLevel > 0)
SET_LOG_LEVEL(logLevelDebug);
_beaconAddressList = config->getPropertyAsString("EPICS_PVA_ADDR_LIST", _beaconAddressList);
_beaconAddressList = config->getPropertyAsString("EPICS_PVAS_BEACON_ADDR_LIST", _beaconAddressList);