8000 fixed to work with node v0.1.30 · Web5design/log4js-node@64fafc3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 64fafc3

Browse files
author
csausdev
committed
fixed to work with node v0.1.30
1 parent f130b95 commit 64fafc3

File tree

3 files changed

+33
-45
lines changed

3 files changed

+33
-45
lines changed

‎spec/fixtures/log4js.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
appenders: [
2+
"appenders": [
33
{
4-
category: "tests",
5-
type: "file",
6-
filename: "tmp-tests.log",
7-
layout: {
8-
type: "messagePassThrough"
4+
"category": "tests",
5+
"type": "file",
6+
"filename": "tmp-tests.log",
7+
"layout": {
8+
"type": "messagePassThrough"
99
}
1010
}
1111
],
1212

13-
levels: {
13+
"levels": {
1414
"tests": "WARN"
1515
}
1616
}

‎spec/fixtures/with-logLevelFilter.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
appenders: [
2+
"appenders": [
33
{
4-
category: "tests",
5-
type: "logLevelFilter",
6-
level: "WARN",
7-
appender: {
8-
type: "file",
9-
filename: "tmp-tests-warnings.log",
10-
layout: {
11-
type: "messagePassThrough"
4+
"category": "tests",
5+
"type": "logLevelFilter",
6+
"level": "WARN",
7+
"appender": {
8+
"type": "file",
9+
"filename": "tmp-tests-warnings.log",
10+
"layout": {
11+
"type": "messagePassThrough"
1212
}
1313
}
1414
},
1515
{
16-
category: "tests",
17-
type: "file",
18-
filename: "tmp-tests.log",
19-
layout: {
20-
type: "messagePassThrough"
16+
"category": "tests",
17+
"type": "file",
18+
"filename": "tmp-tests.log",
19+
"layout": {
20+
"type": "messagePassThrough"
2121
}
2222
}
2323
],
2424

25-
levels: {
25+
"levels": {
2626
"tests": "DEBUG"
2727
}
2828
}

‎spec/spec.logging.js

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
fs = require('fs'), events = require('events');
22

3-
waitForWriteAndThenRead = function (filename) {
4-
//here's the tricky part - writes are asynchronous
5-
//so I'm going to make a promise, wait a bit and then
6-
//try to read the file.
7-
var content, promise = new events.Promise();
8-
promise.addCallback(function() {
9-
content = posix.readFileSync(filename);
10-
});
11-
setTimeout(function() {
12-
promise.emitSuccess();
13-
}, 0);
14-
15-
promise.wait();
16-
return content;
17-
}
3+
waitForWriteAndThenReadFile = function (filename) {
4+
process.loop();
5+
return fs.readFileSync(filename);
6+
};
187

198
describe 'log4js'
209
before_each
@@ -145,7 +134,7 @@ describe 'log4js'
145134
before
146135
log4js.clearAppenders();
147136
try {
148-
posix.unlink('./tmp-tests.log').wait();
137+
fs.unlinkSync('./tmp-tests.log');
149138
} catch(e) {
150139
print('Could not delete tmp-tests.log: '+e.message);
151140
}
@@ -155,8 +144,7 @@ describe 'log4js'
155144
log4js.addAppender(log4js.fileAppender('./tmp-tests.log', log4js.messagePassThroughLayout), 'tests');
156145
logger.debug('this is a test');
157146

158-
var content = waitForWriteAndThenRead('./tmp-tests.log');
159-
content.should.be 'this is a test\n'
147+
waitForWriteAndThenReadFile('./tmp-tests.log').should.be 'this is a test\n'
160148
end
161149
end
162150

@@ -185,12 +173,12 @@ describe 'log4js'
185173
before_each
186174
log4js.clearAppenders();
187175
try {
188-
posix.unlinkSync('./tmp-tests.log');
176+
fs.unlinkSync('./tmp-tests.log');
189177
} catch(e) {
190178
print('Could not delete tmp-tests.log: '+e.message);
191179
}
192180
try {
193-
posix.unlinkSync('./tmp-tests-warnings.log');
181+
fs.unlinkSync('./tmp-tests-warnings.log');
194182
} catch (e) {
195183
print('Could not delete tmp-tests-warnings.log: '+e.message);
196184
}
@@ -207,7 +195,7 @@ describe 'log4js'
207195

208196
logger.warn('this should fire an event');
209197
event.message.should.be 'this should fire an event'
210-
waitForWriteAndThenRead('./tmp-tests.log').should.be 'this should fire an event\n'
198+
waitForWriteAndThenReadFile('./tmp-tests.log').should.be 'this should fire an event\n'
211199
end
212200

213201
it 'should handle logLevelFilter configuration'
@@ -219,8 +207,8 @@ describe 'log4js'
219207
logger.warn('both');
220208
logger.debug('main');
221209

222-
waitForWriteAndThenRead('./tmp-tests.log').should.be 'main\nboth\nboth\nmain\n'
223-
waitForWriteAndThenRead('./tmp-tests-warnings.log').should.be 'both\nboth\n'
210+
waitForWriteAndThenReadFile('./tmp-tests.log').should.be 'main\nboth\nboth\nmain\n'
211+
waitForWriteAndThenReadFile('./tmp-tests-warnings.log').should.be 'both\nboth\n'
224212
end
225213
end
226214
end

0 commit comments

Comments
 (0)
0