Skip to content

Commit 24b6d15

Browse files
committed
fix: ci error with node-v13.6.0 on windows (#46)
Ref: nodejs/node#30556 PR-URL: https://github.com/hyj1991/xprofiler/pull/46 Reviewed-BY: hyj1991 <yeekwanvong@gmail.com>
1 parent d0cf7c1 commit 24b6d15

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

lib/xctl.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ async function createMessageConnection(pid, xprofilerPath, message) {
101101

102102
message = JSON.stringify(message);
103103

104-
/* istanbul ignore if */
105-
if (!fs.existsSync(xprofilerPath)) {
104+
/* istanbul ignore next */
105+
if (os.platform() !== 'win32' && !fs.existsSync(xprofilerPath)) {
106106
throw new Error(`进程 ${pid} 不存在或者没有启动 xprofiler 信令线程!`);
107107
}
108108

src/logger.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ using v8::String;
2525
uv_mutex_lock(&logger_mutex); \
2626
type##_stream.open(filepath, std::ios::app); \
2727
type##_stream << log; \
28-
type##_stream.flush(); \
2928
type##_stream.close(); \
3029
uv_mutex_unlock(&logger_mutex);
3130

test/logbypass.test.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,21 @@ const getTestCases = require('./fixtures/logbypass.test');
1010
const logdirBlocking = utils.createLogDir('log_bypass_blocking');
1111
const logdirNonBlocking = utils.createLogDir('log_bypass_non_blocking');
1212

13+
// common cases
1314
let cases = getTestCases('performance log correctly', logdirBlocking, logdirNonBlocking);
15+
16+
// libuv cases
17+
const logdirBlockingForUv = utils.createLogDir('log_bypass_blocking_uv');
18+
const logdirNonBlockingForUv = utils.createLogDir('log_bypass_non_blocking_uv');
1419
const casesForLibuv = getTestCases('performance log correctly with XPROFILER_ENABLE_LOG_UV_HANDLES=NO',
15-
logdirBlocking, logdirNonBlocking, { XPROFILER_ENABLE_LOG_UV_HANDLES: 'NO' },
20+
logdirBlockingForUv, logdirNonBlockingForUv, { XPROFILER_ENABLE_LOG_UV_HANDLES: 'NO' },
1621
{ uv: getTestCases.getUvRules(['active_handles']) });
22+
23+
// http cases
24+
const logdirBlockingForHttp = utils.createLogDir('log_bypass_blocking_http');
25+
const logdirNonBlockingForHttp = utils.createLogDir('log_bypass_non_blocking_http');
1726
const casesForHttp = getTestCases('performance log correctly XPROFILER_PATCH_HTTP=YES',
18-
logdirBlocking, logdirNonBlocking, { XPROFILER_PATCH_HTTP: 'YES' },
27+
logdirBlockingForHttp, logdirNonBlockingForHttp, { XPROFILER_PATCH_HTTP: 'YES' },
1928
{
2029
http: {
2130
live_http_request: /^\d+$/,
@@ -24,6 +33,8 @@ const casesForHttp = getTestCases('performance log correctly XPROFILER_PATCH_HT
2433
http_rt: /^\d+.\d{2}$/
2534
}
2635
});
36+
37+
// compose cases
2738
cases = cases.concat(casesForLibuv).concat(casesForHttp);
2839

2940
function parseLog(logType, content, patt, alinode) {
@@ -76,6 +87,10 @@ for (const testCase of cases) {
7687
if (testCase.targets.indexOf(target) === testCase.targets.length - 1) {
7788
utils.cleanDir(logdirBlocking);
7889
utils.cleanDir(logdirNonBlocking);
90+
utils.cleanDir(logdirBlockingForUv);
91+
utils.cleanDir(logdirNonBlockingForUv);
92+
utils.cleanDir(logdirBlockingForHttp);
93+
utils.cleanDir(logdirNonBlockingForHttp);
7994
}
8095
}
8196
});

0 commit comments

Comments
 (0)