8000 Merge branch 'master' of https://github.com/dsn/log4js-node into dsn-… · LikeABossProgrammer/log4js-node@73437ec · GitHub
[go: up one dir, main page]

Skip to content

Commit 73437ec

Browse files
author
Gareth Jones
committed
Merge branch 'master' of https://github.com/dsn/log4js-node into dsn-master
2 parents 107e33c + e58cf20 commit 73437ec

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

lib/appenders/multiprocess.js

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,30 @@ function logServer(config) {
3838
var actualAppender = config.actualAppender,
3939
server = net.createServer(function serverCreated(clientSocket) {
4040
clientSocket.setEncoding('utf8');
41-
clientSocket.on('connect', function clientConnected() {
42-
var logMessage = '';
41+
var logMessage = '';
4342

44-
function logTheMessage(msg) {
45-
if (logMessage.length > 0) {
46-
actualAppender(deserializeLoggingEvent(clientSocket, msg));
47-
}
43+
function logTheMessage(msg) {
44+
if (logMessage.length > 0) {
45+
actualAppender(deserializeLoggingEvent(clientSocket, msg));
4846
}
49-
50-
function chunkReceived(chunk) {
51-
var event;
52-
logMessage += chunk || '';
53-
if (logMessage.indexOf(END_MSG) > -1) {
54-
event = logMessage.substring(0, logMessage.indexOf(END_MSG));
55-
logTheMessage(event);
56-
logMessage = logMessage.substring(event.length + END_MSG.length) || '';
57-
//check for more, maybe it was a big chunk
58-
chunkReceived();
59-
}
47+
}
48+
49+
function chunkReceived(chunk) {
50+
var event;
51+
logMessage += chunk || '';
52+
if (logMessage.indexOf(END_MSG) > -1) {
53+
event = logMessage.substring(0, logMessage.indexOf(END_MSG));
54+
logTheMessage(event);
55+
logMessage = logMessage.substring(event.length + END_MSG.length) || '';
56+
//check for more, maybe it was a big chunk
57+
chunkReceived();
6058
}
59+
}
6160

62-
clientSocket.on('data', chunkReceived);
63-
clientSocket.on('end', chunkReceived);
64-
});
61+
clientSocket.on('data', chunkReceived);
62+
clientSocket.on('end', chunkReceived);
6563
});
64+
6665
server.listen(config.loggerPort || 5000, config.loggerHost || 'localhost');
6766

6867
return actualAppender;

0 commit comments

Comments
 (0)
0