Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6d0aa3bc
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6d0aa3bc
编写于
5月 06, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
spell out appRoot and extRoot instead of generic clean-up patterns
上级
c5eee878
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
11 deletion
+15
-11
src/vs/platform/telemetry/browser/telemetryService.ts
src/vs/platform/telemetry/browser/telemetryService.ts
+13
-6
src/vs/workbench/electron-browser/shell.ts
src/vs/workbench/electron-browser/shell.ts
+2
-5
未找到文件。
src/vs/platform/telemetry/browser/telemetryService.ts
浏览文件 @
6d0aa3bc
...
...
@@ -7,6 +7,7 @@
import
*
as
Platform
from
'
vs/base/common/platform
'
;
import
*
as
uuid
from
'
vs/base/common/uuid
'
;
import
{
escapeRegExpCharacters
}
from
'
vs/base/common/strings
'
;
import
{
ITelemetryService
,
ITelemetryAppender
,
ITelemetryInfo
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
ErrorTelemetry
from
'
vs/platform/telemetry/common/errorTelemetry
'
;
import
{
IdleMonitor
,
UserStatus
}
from
'
vs/base/browser/idleMonitor
'
;
...
...
@@ -17,14 +18,13 @@ import {withDefaults, cloneAndChange} from 'vs/base/common/objects';
export
interface
ITelemetryServiceConfig
{
userOptIn
?:
boolean
;
enableHardIdle
?:
boolean
;
enableSoftIdle
?:
boolean
;
sessionID
?:
string
;
commitHash
?:
string
;
version
?:
string
;
cleanupPatterns
?:
[
RegExp
,
string
][]
;
appRoot
?:
string
;
extensionsRoot
?:
string
;
}
export
class
TelemetryService
implements
ITelemetryService
{
...
...
@@ -50,6 +50,7 @@ export class TelemetryService implements ITelemetryService {
private
_startTime
=
new
Date
();
private
_optInFriendly
=
[
'
optInStatus
'
];
//holds a cache of predefined events that can be sent regardress of user optin status
private
_userIdHash
:
string
;
private
_cleanupPatterns
:
[
RegExp
,
string
][]
=
[];
constructor
(
config
?:
ITelemetryServiceConfig
)
{
this
.
_configuration
=
withDefaults
(
config
,
<
ITelemetryServiceConfig
>
{
...
...
@@ -57,14 +58,20 @@ export class TelemetryService implements ITelemetryService {
sessionID
:
uuid
.
generateUuid
()
+
Date
.
now
(),
enableHardIdle
:
true
,
enableSoftIdle
:
true
,
userOptIn
:
true
,
userOptIn
:
true
});
// static cleanup patterns for:
// #1 `file:///DANGEROUS/PATH/resources/app/Useful/Information`
// #2 // Any other file path that doesn't match the approved form above should be cleaned.
// #3 "Error: ENOENT; no such file or directory" is often followed with PII, clean it
this
.
_configuration
.
cleanupPatterns
.
push
(
if
(
this
.
_configuration
.
appRoot
)
{
this
.
_cleanupPatterns
.
push
([
new
RegExp
(
escapeRegExpCharacters
(
this
.
_configuration
.
appRoot
),
'
gi
'
),
''
]);
}
if
(
this
.
_configuration
.
extensionsRoot
)
{
this
.
_cleanupPatterns
.
push
([
new
RegExp
(
escapeRegExpCharacters
(
this
.
_configuration
.
extensionsRoot
),
'
gi
'
),
''
]);
}
this
.
_cleanupPatterns
.
push
(
[
/file:
\/\/\/
.*
?\/
resources
\/
app
\/
/gi
,
''
],
[
/file:
\/\/\/
.*/gi
,
''
],
[
/ENOENT: no such file or directory.*
?\'([^\']
+
)\'
/gi
,
'
ENOENT: no such file or directory
'
]
...
...
@@ -186,7 +193,7 @@ export class TelemetryService implements ITelemetryService {
private
_cleanupInfo
(
stack
:
string
):
string
{
// sanitize with configured cleanup patterns
for
(
let
tuple
of
this
.
_c
onfiguration
.
c
leanupPatterns
)
{
for
(
let
tuple
of
this
.
_cleanupPatterns
)
{
let
[
regexp
,
replaceValue
]
=
tuple
;
stack
=
stack
.
replace
(
regexp
,
replaceValue
);
}
...
...
src/vs/workbench/electron-browser/shell.ts
浏览文件 @
6d0aa3bc
...
...
@@ -11,7 +11,6 @@ import * as nls from 'vs/nls';
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
{
Dimension
,
Builder
,
$
}
from
'
vs/base/browser/builder
'
;
import
{
escapeRegExpCharacters
}
from
'
vs/base/common/strings
'
;
import
dom
=
require
(
'
vs/base/browser/dom
'
);
import
aria
=
require
(
'
vs/base/browser/ui/aria/aria
'
);
import
{
dispose
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
...
...
@@ -205,10 +204,8 @@ export class WorkbenchShell {
if
(
this
.
configuration
.
env
.
isBuilt
&&
!
this
.
configuration
.
env
.
extensionDevelopmentPath
&&
!!
this
.
configuration
.
env
.
enableTelemetry
)
{
this
.
telemetryService
=
new
ElectronTelemetryService
(
this
.
configurationService
,
this
.
storageService
,
{
cleanupPatterns
:
[
[
new
RegExp
(
escapeRegExpCharacters
(
this
.
configuration
.
env
.
appRoot
),
'
gi
'
),
''
],
[
new
RegExp
(
escapeRegExpCharacters
(
this
.
configuration
.
env
.
userExtensionsHome
),
'
gi
'
),
''
]
],
appRoot
:
this
.
configuration
.
env
.
appRoot
,
extensionsRoot
:
this
.
configuration
.
env
.
userExtensionsHome
,
version
:
this
.
configuration
.
env
.
version
,
commitHash
:
this
.
configuration
.
env
.
commitHash
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录