mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libwinpr-utils: improved binary appender

Browse Source
This commit is contained in:
Marc-André Moreau 2013-10-04 11:33:49 -04:00
parent aaeb4ea0b2
commit e37981e57c
4 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winpr/libwinpr/utils/test/TestWLog.c
View File

@ -16,7 +16,7 @@ int TestWLog(int argc, char* argv[])
root = WLog_GetRoot();
WLog_SetLogAppenderType(root, WLOG_APPENDER_FILE);
WLog_SetLogAppenderType(root, WLOG_APPENDER_BINARY);
appender = WLog_GetLogAppender(root);
WLog_ConsoleAppender_SetOutputStream(root, (wLogConsoleAppender*) appender, WLOG_CONSOLE_STDERR);

45
winpr/libwinpr/utils/wlog/BinaryAppender.c
View File

@ -25,6 +25,7 @@
#include <winpr/file.h>
#include <winpr/path.h>
#include <winpr/thread.h>
#include <winpr/stream.h>
#include <winpr/wlog.h>
@ -82,7 +83,7 @@ int WLog_BinaryAppender_Open(wLog* log, wLogBinaryAppender* appender)
if (!appender->FileName)
{
appender->FileName = (char*) malloc(256);
sprintf_s(appender->FileName, 256, "%u.bin.log", (unsigned int) ProcessId);
sprintf_s(appender->FileName, 256, "%u.wlog", (unsigned int) ProcessId);
}
if (!appender->FullFileName)
@ -113,7 +114,11 @@ int WLog_BinaryAppender_Close(wLog* log, wLogBinaryAppender* appender)
int WLog_BinaryAppender_WriteMessage(wLog* log, wLogBinaryAppender* appender, wLogMessage* message)
{
FILE* fp;
char prefix[WLOG_MAX_PREFIX_SIZE];
wStream* s;
int MessageLength;
int FileNameLength;
int FunctionNameLength;
int TextStringLength;
if (message->Level > log->Level)
return 0;
@ -123,10 +128,38 @@ int WLog_BinaryAppender_WriteMessage(wLog* log, wLogBinaryAppender* appender, wL
if (!fp)
return -1;
message->PrefixString = prefix;
WLog_Layout_GetMessagePrefix(log, appender->Layout, message);
FileNameLength = strlen(message->FileName);
FunctionNameLength = strlen(message->FunctionName);
TextStringLength = strlen(message->TextString);
fprintf(fp, "%s%s\n", message->PrefixString, message->TextString);
MessageLength = 16 +
(4 + FileNameLength + 1) +
(4 + FunctionNameLength + 1) +
(4 + TextStringLength + 1);
s = Stream_New(NULL, MessageLength);
Stream_Write_UINT32(s, MessageLength);
Stream_Write_UINT32(s, message->Type);
Stream_Write_UINT32(s, message->Level);
Stream_Write_UINT32(s, message->LineNumber);
Stream_Write_UINT32(s, FileNameLength);
Stream_Write(s, message->FileName, FileNameLength + 1);
Stream_Write_UINT32(s, FunctionNameLength);
Stream_Write(s, message->FunctionName, FunctionNameLength + 1);
Stream_Write_UINT32(s, TextStringLength);
Stream_Write(s, message->TextString, TextStringLength + 1);
Stream_SealLength(s);
fwrite(Stream_Buffer(s), MessageLength, 1, fp);
Stream_Free(s, TRUE);
return 1;
}
@ -151,6 +184,8 @@ wLogBinaryAppender* WLog_BinaryAppender_New(wLog* log)
{
ZeroMemory(BinaryAppender, sizeof(wLogBinaryAppender));
BinaryAppender->Type = WLOG_APPENDER_BINARY;
BinaryAppender->Open = (WLOG_APPENDER_OPEN_FN) WLog_BinaryAppender_Open;
BinaryAppender->Close = (WLOG_APPENDER_OPEN_FN) WLog_BinaryAppender_Close;

2
winpr/libwinpr/utils/wlog/ConsoleAppender.c
View File

@ -126,6 +126,8 @@ wLogConsoleAppender* WLog_ConsoleAppender_New(wLog* log)
{
ZeroMemory(ConsoleAppender, sizeof(wLogConsoleAppender));
ConsoleAppender->Type = WLOG_APPENDER_CONSOLE;
ConsoleAppender->Open = (WLOG_APPENDER_OPEN_FN) WLog_ConsoleAppender_Open;
ConsoleAppender->Close = (WLOG_APPENDER_OPEN_FN) WLog_ConsoleAppender_Close;

2
winpr/libwinpr/utils/wlog/FileAppender.c
View File

@ -176,6 +176,8 @@ wLogFileAppender* WLog_FileAppender_New(wLog* log)
{
ZeroMemory(FileAppender, sizeof(wLogFileAppender));
FileAppender->Type = WLOG_APPENDER_FILE;
FileAppender->Open = (WLOG_APPENDER_OPEN_FN) WLog_FileAppender_Open;
FileAppender->Close = (WLOG_APPENDER_OPEN_FN) WLog_FileAppender_Close;