Skip to content

Move redux logging to a different file #10605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 17, 2020
Merged

Move redux logging to a different file #10605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
497d7b5
Move redux logging to a different file
rchiodo Mar 17, 2020
21203d0
Put back launch.json
rchiodo Mar 17, 2020
d9cd2b7
Delete unnecessary file
rchiodo Mar 17, 2020
3fb9085
Fix it so only loads during tests
rchiodo Mar 17, 2020
b704b49
Update dependency list
rchiodo Mar 17, 2020
1046292
Make sure to exclude log4js when not needed
rchiodo Mar 17, 2020
316dd48
Remove unneeded dependencies
rchiodo Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
"--ui=tdd",
"--recursive",
"--colors",
//"--grep", "<suite name>",
//"--grep", "<suite>",
"--timeout=300000"
],
"env": {
Expand All @@ -243,7 +243,7 @@
// Remove 'X' to turn on all logging in the debug output
"XVSC_PYTHON_FORCE_LOGGING": "1",
// Remove `X` prefix and update path to test with real python interpreter (for DS functional tests).
"XCI_PYTHON_PATH": "<Python Path>"
"XCI_PYTHON_PATH": "<Python Path>",
},
"outFiles": [
"${workspaceFolder}/out/**/*.js"
Expand Down
1 change: 1 addition & 0 deletions build/ci/templates/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ variables:
MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter).
VSC_PYTHON_FORCE_LOGGING: true # Enable this to turn on console output for the logger
VSC_PYTHON_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc.log'
VSC_PYTHON_WEBVIEW_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc_webview.log'
CI_BRANCH_NAME: ${Build.SourceBranchName}
npm_config_cache: $(Pipeline.Workspace)/.npm
vmImageMacOS: 'macOS-10.15'
1 change: 1 addition & 0 deletions build/webpack/webpack.datascience-ui.config.builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ function buildConfiguration(isNotebook) {
}),
...getPlugins(isNotebook)
],
externals: ['log4js'],
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, this will also work, i.e. unconditional.

resolve: {
// Add '.ts' and '.tsx' as resolvable extensions.
extensions: ['.ts', '.tsx', '.js', '.json', '.svg']
Expand Down
4 changes: 3 additions & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,9 @@ function getAllowedWarningsForWebPack(buildConfig) {
'WARNING in ./node_modules/ws/lib/validation.js',
'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/buffer-util.js',
'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/validation.js',
'WARNING in ./node_modules/any-promise/register.js'
'WARNING in ./node_modules/any-promise/register.js',
'WARNING in ./node_modules/log4js/lib/appenders/index.js',
'WARNING in ./node_modules/log4js/lib/clustering.js'
];
case 'extension':
return [
Expand Down
72 changes: 72 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading