From b9899213d4e61de8cc28e0006bf5196e605f676e Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Sun, 4 Apr 2021 09:48:45 -0700 Subject: [PATCH] colorize errors and warnings Use ERL_ERROR and ERL_WARNING git grep -li 'errlogPrintf.*[" ]error' | xargs sed -i -E -e 's|(errlogPrintf.*[" ])(error)|\1" ERL_ERROR "|g' git grep -li 'errlogPrintf.*[" ]warn' | xargs sed -i -E -e 's|(errlogPrintf.*[" ])(warn[a-zA-Z]*)|\1" ERL_WARNING "|g' --- modules/ca/src/client/casw.cpp | 2 +- modules/ca/src/client/tcpiiu.cpp | 10 +++++----- modules/ca/src/client/udpiiu.cpp | 4 ++-- modules/database/src/ioc/db/callback.c | 8 ++++---- modules/database/src/ioc/db/dbCa.c | 8 ++++---- modules/database/src/ioc/db/dbConvertJSON.c | 2 +- modules/database/src/ioc/db/dbScan.c | 2 +- modules/database/src/ioc/rsrv/camsgtask.c | 2 +- modules/database/src/ioc/rsrv/caserverio.c | 2 +- modules/database/src/ioc/rsrv/caservertask.c | 16 ++++++++-------- modules/database/src/ioc/rsrv/online_notify.c | 2 +- modules/libcom/src/osi/os/posix/osdMutex.c | 4 ++-- modules/libcom/src/osi/os/posix/osdSpin.c | 2 +- modules/libcom/src/osi/os/posix/osdThread.c | 4 ++-- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/modules/ca/src/client/casw.cpp b/modules/ca/src/client/casw.cpp index 49c45ef3d..c9ff465f7 100644 --- a/modules/ca/src/client/casw.cpp +++ b/modules/ca/src/client/casw.cpp @@ -188,7 +188,7 @@ int main ( int argc, char ** argv ) epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); epicsSocketDestroy ( sock ); - errlogPrintf ("casw: error from recv was = \"%s\"\n", + errlogPrintf ("casw: " ERL_ERROR " from recv was = \"%s\"\n", sockErrBuf ); return -1; } diff --git a/modules/ca/src/client/tcpiiu.cpp b/modules/ca/src/client/tcpiiu.cpp index a8b04a2f7..3d68433eb 100644 --- a/modules/ca/src/client/tcpiiu.cpp +++ b/modules/ca/src/client/tcpiiu.cpp @@ -178,7 +178,7 @@ void tcpSendThread::run () char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ("CAC TCP clean socket shutdown error was %s\n", + errlogPrintf ("CAC TCP clean socket shutdown " ERL_ERROR " was %s\n", sockErrBuf ); } } @@ -194,7 +194,7 @@ void tcpSendThread::run () char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ("CAC TCP clean socket shutdown error was %s\n", + errlogPrintf ("CAC TCP clean socket shutdown " ERL_ERROR " was %s\n", sockErrBuf ); } } @@ -283,7 +283,7 @@ unsigned tcpiiu::sendBytes ( const void *pBuf, char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ( "CAC: unexpected TCP send error: %s\n", + errlogPrintf ( "CAC: unexpected TCP send " ERL_ERROR ": %s\n", sockErrBuf ); } @@ -957,7 +957,7 @@ void tcpiiu::initiateAbortShutdown ( char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ( "CAC TCP socket linger set error was %s\n", + errlogPrintf ( "CAC TCP socket linger set " ERL_ERROR " was %s\n", sockErrBuf ); } this->discardingPendingData = true; @@ -988,7 +988,7 @@ void tcpiiu::initiateAbortShutdown ( char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ("CAC TCP socket shutdown error was %s\n", + errlogPrintf ("CAC TCP socket shutdown " ERL_ERROR " was %s\n", sockErrBuf ); } } diff --git a/modules/ca/src/client/udpiiu.cpp b/modules/ca/src/client/udpiiu.cpp index 1b299278c..7b854b500 100644 --- a/modules/ca/src/client/udpiiu.cpp +++ b/modules/ca/src/client/udpiiu.cpp @@ -266,7 +266,7 @@ udpiiu::udpiiu ( epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); epicsSocketDestroy ( this->sock ); - errlogPrintf ( "CAC: getsockname () error was \"%s\"\n", sockErrBuf ); + errlogPrintf ( "CAC: getsockname () " ERL_ERROR " was \"%s\"\n", sockErrBuf ); throwWithLocation ( noSocket () ); } if ( tmpAddr.sa.sa_family != AF_INET) { @@ -428,7 +428,7 @@ void udpRecvThread::run () char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ( "CAC: UDP recv error was \"%s\"\n", + errlogPrintf ( "CAC: UDP recv " ERL_ERROR " was \"%s\"\n", sockErrBuf ); } } diff --git a/modules/database/src/ioc/db/callback.c b/modules/database/src/ioc/db/callback.c index 4a26e27ac..d58b8fc6f 100644 --- a/modules/database/src/ioc/db/callback.c +++ b/modules/database/src/ioc/db/callback.c @@ -85,7 +85,7 @@ static epicsEventId startStopEvent; static char *threadNamePrefix[NUM_CALLBACK_PRIORITIES] = { "cbLow", "cbMedium", "cbHigh" }; -#define FULL_MSG(name) "callbackRequest: " name " ring buffer full\n" +#define FULL_MSG(name) "callbackRequest: " ERL_ERROR " " name " ring buffer full\n" static char *fullMessage[NUM_CALLBACK_PRIORITIES] = { FULL_MSG("cbLow"), FULL_MSG("cbMedium"), FULL_MSG("cbHigh") }; @@ -326,17 +326,17 @@ int callbackRequest(epicsCallback *pcallback) cbQueueSet *mySet; if (!pcallback) { - epicsInterruptContextMessage("callbackRequest: pcallback was NULL\n"); + epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " pcallback was NULL\n"); return S_db_notInit; } priority = pcallback->priority; if (priority < 0 || priority >= NUM_CALLBACK_PRIORITIES) { - epicsInterruptContextMessage("callbackRequest: Bad priority\n"); + epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " Bad priority\n"); return S_db_badChoice; } mySet = &callbackQueue[priority]; if (!mySet->queue) { - epicsInterruptContextMessage("callbackRequest: Callbacks not initialized\n"); + epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " Callbacks not initialized\n"); return S_db_notInit; } if (mySet->queueOverflow) return S_db_bufFull; diff --git a/modules/database/src/ioc/db/dbCa.c b/modules/database/src/ioc/db/dbCa.c index 70f939897..56d700396 100644 --- a/modules/database/src/ioc/db/dbCa.c +++ b/modules/database/src/ioc/db/dbCa.c @@ -881,10 +881,10 @@ static void eventCallback(struct event_handler_args arg) if (precord) { if (arg.status != ECA_NORDACCESS && arg.status != ECA_GETFAIL) - errlogPrintf("dbCa: eventCallback record %s error %s\n", + errlogPrintf("dbCa: eventCallback record %s " ERL_ERROR " %s\n", precord->name, ca_message(arg.status)); } else { - errlogPrintf("dbCa: eventCallback error %s\n", + errlogPrintf("dbCa: eventCallback " ERL_ERROR " %s\n", ca_message(arg.status)); } goto done; @@ -1029,10 +1029,10 @@ static void getAttribEventCallback(struct event_handler_args arg) if (arg.status != ECA_NORMAL) { dbCommon *precord = plink->precord; if (precord) { - errlogPrintf("dbCa: getAttribEventCallback record %s error %s\n", + errlogPrintf("dbCa: getAttribEventCallback record %s " ERL_ERROR " %s\n", precord->name, ca_message(arg.status)); } else { - errlogPrintf("dbCa: getAttribEventCallback error %s\n", + errlogPrintf("dbCa: getAttribEventCallback " ERL_ERROR " %s\n", ca_message(arg.status)); } epicsMutexUnlock(pca->lock); diff --git a/modules/database/src/ioc/db/dbConvertJSON.c b/modules/database/src/ioc/db/dbConvertJSON.c index 2f54aa0d9..865c43313 100644 --- a/modules/database/src/ioc/db/dbConvertJSON.c +++ b/modules/database/src/ioc/db/dbConvertJSON.c @@ -98,7 +98,7 @@ static int dblsj_string(void *ctx, const unsigned char *val, size_t len) { char *pdest = parser->pdest; if (parser->dbrType != DBF_STRING) { - errlogPrintf("dbConvertJSON: dblsj_string dbrType error\n"); + errlogPrintf("dbConvertJSON: dblsj_string dbrType " ERL_ERROR "\n"); return 0; /* Illegal */ } diff --git a/modules/database/src/ioc/db/dbScan.c b/modules/database/src/ioc/db/dbScan.c index 0b951dd4b..f3e354e78 100644 --- a/modules/database/src/ioc/db/dbScan.c +++ b/modules/database/src/ioc/db/dbScan.c @@ -817,7 +817,7 @@ static void periodicTask(void *arg) epicsTimeAddSeconds(&next, delay); if (++overruns >= 10 && epicsTimeDiffInSeconds(&now, &reported) > report_delay) { - errlogPrintf("\ndbScan warning from '%s' scan thread:\n" + errlogPrintf("\ndbScan " ERL_WARNING " from '%s' scan thread:\n" "\tScan processing averages %.3f seconds (%.3f .. %.3f).\n" "\tOver-runs have now happened %u times in a row.\n" "\tTo fix this, move some records to a slower scan rate.\n", diff --git a/modules/database/src/ioc/rsrv/camsgtask.c b/modules/database/src/ioc/rsrv/camsgtask.c index eee7ab238..24df11d39 100644 --- a/modules/database/src/ioc/rsrv/camsgtask.c +++ b/modules/database/src/ioc/rsrv/camsgtask.c @@ -58,7 +58,7 @@ void camsgtask ( void *pParm ) epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf("CAS: FIONREAD error: %s\n", + errlogPrintf("CAS: FIONREAD " ERL_ERROR ": %s\n", sockErrBuf); cas_send_bs_msg(client, TRUE); } diff --git a/modules/database/src/ioc/rsrv/caserverio.c b/modules/database/src/ioc/rsrv/caserverio.c index 9703197a0..4e953ef85 100644 --- a/modules/database/src/ioc/rsrv/caserverio.c +++ b/modules/database/src/ioc/rsrv/caserverio.c @@ -139,7 +139,7 @@ void cas_send_bs_msg ( struct client *pclient, int lock_needed ) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ("CAS: Socket shutdown error: %s\n", + errlogPrintf ("CAS: Socket shutdown " ERL_ERROR ": %s\n", sockErrBuf ); } } diff --git a/modules/database/src/ioc/rsrv/caservertask.c b/modules/database/src/ioc/rsrv/caservertask.c index 4cff62224..403950989 100644 --- a/modules/database/src/ioc/rsrv/caservertask.c +++ b/modules/database/src/ioc/rsrv/caservertask.c @@ -86,7 +86,7 @@ static void req_server (void *pParm) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf("CAS: Client accept error: %s (%d)\n", + errlogPrintf("CAS: Client accept " ERL_ERROR ": %s (%d)\n", sockErrBuf, (int)addLen ); epicsThreadSleep(15.0); continue; @@ -131,7 +131,7 @@ int tryBind(SOCKET sock, const osiSockAddr* addr, const char *name) { epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ( "CAS: %s bind error: %s\n", + errlogPrintf ( "CAS: %s bind " ERL_ERROR ": %s\n", name, sockErrBuf ); epicsThreadSuspendSelf (); } @@ -196,7 +196,7 @@ SOCKET* rsrv_grab_tcp(unsigned short *port) char sockErrBuf[64]; epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); - errlogPrintf ( "CAS: getsockname error: %s\n", + errlogPrintf ( "CAS: getsockname " ERL_ERROR ": %s\n", sockErrBuf ); epicsThreadSuspendSelf (); ok = 0; @@ -576,12 +576,12 @@ void rsrv_init (void) if ( sport != ca_server_port ) { ca_server_port = sport; - errlogPrintf ( "cas warning: Configured TCP port was unavailable.\n"); - errlogPrintf ( "cas warning: Using dynamically assigned TCP port %hu,\n", + errlogPrintf ( "cas " ERL_WARNING ": Configured TCP port was unavailable.\n"); + errlogPrintf ( "cas " ERL_WARNING ": Using dynamically assigned TCP port %hu,\n", ca_server_port ); - errlogPrintf ( "cas warning: but now two or more servers share the same UDP port.\n"); - errlogPrintf ( "cas warning: Depending on your IP kernel this server may not be\n" ); - errlogPrintf ( "cas warning: reachable with UDP unicast (a host's IP in EPICS_CA_ADDR_LIST)\n" ); + errlogPrintf ( "cas " ERL_WARNING ": but now two or more servers share the same UDP port.\n"); + errlogPrintf ( "cas " ERL_WARNING ": Depending on your IP kernel this server may not be\n" ); + errlogPrintf ( "cas " ERL_WARNING ": reachable with UDP unicast (a host's IP in EPICS_CA_ADDR_LIST)\n" ); } } diff --git a/modules/database/src/ioc/rsrv/online_notify.c b/modules/database/src/ioc/rsrv/online_notify.c index 7f75bde37..e192e7461 100644 --- a/modules/database/src/ioc/rsrv/online_notify.c +++ b/modules/database/src/ioc/rsrv/online_notify.c @@ -94,7 +94,7 @@ void rsrv_online_notify_task(void *pParm) epicsSocketConvertErrorToString(sockErrBuf, sizeof(sockErrBuf), err); ipAddrToDottedIP(&pAddr->addr.ia, sockDipBuf, sizeof(sockDipBuf)); - errlogPrintf ( "CAS: CA beacon send to %s error: %s\n", + errlogPrintf ( "CAS: CA beacon send to %s " ERL_ERROR ": %s\n", sockDipBuf, sockErrBuf); lastError[i] = err; diff --git a/modules/libcom/src/osi/os/posix/osdMutex.c b/modules/libcom/src/osi/os/posix/osdMutex.c index 18cd08d95..85040c5f4 100644 --- a/modules/libcom/src/osi/os/posix/osdMutex.c +++ b/modules/libcom/src/osi/os/posix/osdMutex.c @@ -36,12 +36,12 @@ #define checkStatus(status,message) \ if((status)) { \ - errlogPrintf("epicsMutex %s failed: error %s\n", \ + errlogPrintf("epicsMutex %s failed: " ERL_ERROR " %s\n", \ (message), strerror((status))); \ } #define checkStatusQuit(status,message,method) \ if(status) { \ - errlogPrintf("epicsMutex %s failed: error %s\n", \ + errlogPrintf("epicsMutex %s failed: " ERL_ERROR " %s\n", \ (message), strerror((status))); \ cantProceed((method)); \ } diff --git a/modules/libcom/src/osi/os/posix/osdSpin.c b/modules/libcom/src/osi/os/posix/osdSpin.c index 0b924ee3a..8b1fa1793 100644 --- a/modules/libcom/src/osi/os/posix/osdSpin.c +++ b/modules/libcom/src/osi/os/posix/osdSpin.c @@ -34,7 +34,7 @@ #define checkStatus(status,message) \ if ((status)) { \ - errlogPrintf("epicsSpin %s failed: error %s\n", \ + errlogPrintf("epicsSpin %s failed: " ERL_ERROR " %s\n", \ (message), strerror((status))); \ } diff --git a/modules/libcom/src/osi/os/posix/osdThread.c b/modules/libcom/src/osi/os/posix/osdThread.c index 3cba2fa67..62dd0a700 100644 --- a/modules/libcom/src/osi/os/posix/osdThread.c +++ b/modules/libcom/src/osi/os/posix/osdThread.c @@ -94,12 +94,12 @@ static epicsThreadOSD *createImplicit(void); #define checkStatus(status,message) \ if((status)) {\ - errlogPrintf("%s error %s\n",(message),strerror((status))); \ + errlogPrintf("%s " ERL_ERROR " %s\n",(message),strerror((status))); \ } #define checkStatusQuit(status,message,method) \ if(status) { \ - errlogPrintf("%s error %s\n",(message),strerror((status))); \ + errlogPrintf("%s " ERL_ERROR " %s\n",(message),strerror((status))); \ cantProceed((method)); \ }