Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
c0bc1ace
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c0bc1ace
编写于
11月 24, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
CLI Process: missing machine identifier (fixes #39044)
上级
91771ceb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
5 deletion
+7
-5
src/vs/code/node/cliProcessMain.ts
src/vs/code/node/cliProcessMain.ts
+5
-1
src/vs/platform/telemetry/node/commonProperties.ts
src/vs/platform/telemetry/node/commonProperties.ts
+2
-4
未找到文件。
src/vs/code/node/cliProcessMain.ts
浏览文件 @
c0bc1ace
...
@@ -33,6 +33,8 @@ import { mkdirp, writeFile } from 'vs/base/node/pfs';
...
@@ -33,6 +33,8 @@ import { mkdirp, writeFile } from 'vs/base/node/pfs';
import
{
IChoiceService
}
from
'
vs/platform/message/common/message
'
;
import
{
IChoiceService
}
from
'
vs/platform/message/common/message
'
;
import
{
ChoiceCliService
}
from
'
vs/platform/message/node/messageCli
'
;
import
{
ChoiceCliService
}
from
'
vs/platform/message/node/messageCli
'
;
import
{
getBaseLabel
}
from
'
vs/base/common/labels
'
;
import
{
getBaseLabel
}
from
'
vs/base/common/labels
'
;
import
{
IStateService
}
from
'
vs/platform/state/common/state
'
;
import
{
StateService
}
from
'
vs/platform/state/node/stateService
'
;
const
notFound
=
(
id
:
string
)
=>
localize
(
'
notFound
'
,
"
Extension '{0}' not found.
"
,
id
);
const
notFound
=
(
id
:
string
)
=>
localize
(
'
notFound
'
,
"
Extension '{0}' not found.
"
,
id
);
const
notInstalled
=
(
id
:
string
)
=>
localize
(
'
notInstalled
'
,
"
Extension '{0}' is not installed.
"
,
id
);
const
notInstalled
=
(
id
:
string
)
=>
localize
(
'
notInstalled
'
,
"
Extension '{0}' is not installed.
"
,
id
);
...
@@ -176,11 +178,13 @@ const eventPrefix = 'monacoworkbench';
...
@@ -176,11 +178,13 @@ const eventPrefix = 'monacoworkbench';
export
function
main
(
argv
:
ParsedArgs
):
TPromise
<
void
>
{
export
function
main
(
argv
:
ParsedArgs
):
TPromise
<
void
>
{
const
services
=
new
ServiceCollection
();
const
services
=
new
ServiceCollection
();
services
.
set
(
IEnvironmentService
,
new
SyncDescriptor
(
EnvironmentService
,
argv
,
process
.
execPath
));
services
.
set
(
IEnvironmentService
,
new
SyncDescriptor
(
EnvironmentService
,
argv
,
process
.
execPath
));
services
.
set
(
IStateService
,
new
SyncDescriptor
(
StateService
));
const
instantiationService
:
IInstantiationService
=
new
InstantiationService
(
services
);
const
instantiationService
:
IInstantiationService
=
new
InstantiationService
(
services
);
return
instantiationService
.
invokeFunction
(
accessor
=>
{
return
instantiationService
.
invokeFunction
(
accessor
=>
{
const
envService
=
accessor
.
get
(
IEnvironmentService
);
const
envService
=
accessor
.
get
(
IEnvironmentService
);
const
stateService
=
accessor
.
get
(
IStateService
);
return
TPromise
.
join
([
envService
.
appSettingsHome
,
envService
.
extensionsPath
].
map
(
p
=>
mkdirp
(
p
))).
then
(()
=>
{
return
TPromise
.
join
([
envService
.
appSettingsHome
,
envService
.
extensionsPath
].
map
(
p
=>
mkdirp
(
p
))).
then
(()
=>
{
const
{
appRoot
,
extensionsPath
,
extensionDevelopmentPath
,
isBuilt
,
installSource
}
=
envService
;
const
{
appRoot
,
extensionsPath
,
extensionDevelopmentPath
,
isBuilt
,
installSource
}
=
envService
;
...
@@ -205,7 +209,7 @@ export function main(argv: ParsedArgs): TPromise<void> {
...
@@ -205,7 +209,7 @@ export function main(argv: ParsedArgs): TPromise<void> {
const
config
:
ITelemetryServiceConfig
=
{
const
config
:
ITelemetryServiceConfig
=
{
appender
:
combinedAppender
(...
appenders
),
appender
:
combinedAppender
(...
appenders
),
commonProperties
:
resolveCommonProperties
(
product
.
commit
,
pkg
.
version
,
installSource
),
commonProperties
:
resolveCommonProperties
(
product
.
commit
,
pkg
.
version
,
installSource
,
stateService
.
getItem
(
'
telemetry.machineId
'
)
),
piiPaths
:
[
appRoot
,
extensionsPath
]
piiPaths
:
[
appRoot
,
extensionsPath
]
};
};
...
...
src/vs/platform/telemetry/node/commonProperties.ts
浏览文件 @
c0bc1ace
...
@@ -8,12 +8,10 @@ import * as os from 'os';
...
@@ -8,12 +8,10 @@ import * as os from 'os';
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
uuid
from
'
vs/base/common/uuid
'
;
import
*
as
uuid
from
'
vs/base/common/uuid
'
;
export
function
resolveCommonProperties
(
commit
:
string
,
version
:
string
,
source
:
string
,
machineId
?
:
string
):
TPromise
<
{
[
name
:
string
]:
string
;
}
>
{
export
function
resolveCommonProperties
(
commit
:
string
,
version
:
string
,
source
:
string
,
machineId
:
string
):
TPromise
<
{
[
name
:
string
]:
string
;
}
>
{
const
result
:
{
[
name
:
string
]:
string
;
}
=
Object
.
create
(
null
);
const
result
:
{
[
name
:
string
]:
string
;
}
=
Object
.
create
(
null
);
// __GDPR__COMMON__ "common.machineId" : { "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
// __GDPR__COMMON__ "common.machineId" : { "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
if
(
typeof
machineId
===
'
string
'
)
{
result
[
'
common.machineId
'
]
=
machineId
;
result
[
'
common.machineId
'
]
=
machineId
;
}
// __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
// __GDPR__COMMON__ "sessionID" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
result
[
'
sessionID
'
]
=
uuid
.
generateUuid
()
+
Date
.
now
();
result
[
'
sessionID
'
]
=
uuid
.
generateUuid
()
+
Date
.
now
();
// __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
// __GDPR__COMMON__ "commitHash" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录