|
 |
fde8c1 |
diff -up ./plugins/imjournal/imjournal.c.journal-reloaded ./plugins/imjournal/imjournal.c
|
|
|
fde8c1 |
--- ./plugins/imjournal/imjournal.c.journal-reloaded 2017-10-09 11:05:53.698885473 -0400
|
|
|
fde8c1 |
+++ ./plugins/imjournal/imjournal.c 2017-10-09 11:08:54.179885473 -0400
|
|
|
fde8c1 |
@@ -509,8 +509,7 @@ pollJournal(void)
|
|
|
fde8c1 |
}
|
|
|
fde8c1 |
|
|
|
fde8c1 |
iRet = loadJournalState();
|
|
|
fde8c1 |
- errmsg.LogError(0, RS_RET_OK, "imjournal: "
|
|
|
fde8c1 |
- "journal reloaded...");
|
|
|
fde8c1 |
+ LogMsg(0, RS_RET_OK, LOG_NOTICE, "imjournal: journal reloaded...");
|
|
|
fde8c1 |
} else if (jr < 0) {
|
|
|
fde8c1 |
char errStr[256];
|
|
|
fde8c1 |
rs_strerror_r(errno, errStr, sizeof(errStr));
|
|
|
fde8c1 |
diff -up ./runtime/errmsg.c.journal-reloaded ./runtime/errmsg.c
|
|
|
fde8c1 |
--- ./runtime/errmsg.c.journal-reloaded 2016-12-03 12:41:03.000000000 -0500
|
|
|
fde8c1 |
+++ ./runtime/errmsg.c 2017-10-09 11:05:53.704885473 -0400
|
|
|
fde8c1 |
@@ -115,7 +115,7 @@ doLogMsg(const int iErrno, const int iEr
|
|
|
fde8c1 |
* maps to a specific error event).
|
|
|
fde8c1 |
* rgerhards, 2008-06-27
|
|
|
fde8c1 |
*/
|
|
|
fde8c1 |
-static void __attribute__((format(printf, 3, 4)))
|
|
|
fde8c1 |
+void __attribute__((format(printf, 3, 4)))
|
|
|
fde8c1 |
LogError(const int iErrno, const int iErrCode, const char *fmt, ... )
|
|
|
fde8c1 |
{
|
|
|
fde8c1 |
va_list ap;
|
|
|
fde8c1 |
@@ -144,7 +144,7 @@ LogError(const int iErrno, const int iEr
|
|
|
fde8c1 |
* maps to a specific error event).
|
|
|
fde8c1 |
* rgerhards, 2008-06-27
|
|
|
fde8c1 |
*/
|
|
|
fde8c1 |
-static void __attribute__((format(printf, 4, 5)))
|
|
|
fde8c1 |
+void __attribute__((format(printf, 4, 5)))
|
|
|
fde8c1 |
LogMsg(const int iErrno, const int iErrCode, const int severity, const char *fmt, ... )
|
|
|
fde8c1 |
{
|
|
|
fde8c1 |
va_list ap;
|
|
|
fde8c1 |
diff -up ./runtime/errmsg.h.journal-reloaded ./runtime/errmsg.h
|
|
|
fde8c1 |
--- ./runtime/errmsg.h.journal-reloaded 2016-12-03 12:41:03.000000000 -0500
|
|
|
fde8c1 |
+++ ./runtime/errmsg.h 2017-10-09 11:05:53.704885473 -0400
|
|
|
fde8c1 |
@@ -44,5 +44,8 @@ ENDinterface(errmsg)
|
|
|
fde8c1 |
PROTOTYPEObj(errmsg);
|
|
|
fde8c1 |
void resetErrMsgsFlag(void);
|
|
|
fde8c1 |
int hadErrMsgs(void);
|
|
|
fde8c1 |
+void __attribute__((format(printf, 3, 4))) LogError(const int iErrno, const int iErrCode, const char *fmt, ... );
|
|
|
fde8c1 |
+void __attribute__((format(printf, 4, 5)))
|
|
|
fde8c1 |
+ LogMsg(const int iErrno, const int iErrCode, const int severity, const char *fmt, ... );
|
|
|
fde8c1 |
|
|
|
fde8c1 |
#endif /* #ifndef INCLUDED_ERRMSG_H */
|