Add modern logs for Serverless Framework v3 #646
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pgrzesik
force-pushed
the
add-modern-logs
branch
2 times, most recently
from
0bc3ef9 to
6558824
Compare
pgrzesik
force-pushed
the
add-modern-logs
branch
2 times, most recently
from
ea17323 to
0149309
Compare
pgrzesik
force-pushed
the
add-modern-logs
branch
from
0149309 to
af50c33
Compare
medikoo
reviewed
Nov 25, 2021
lib/clean.js
Outdated
| if (this.serverless) { | ||
| this.serverless.cli.log(`Removing static caches at: ${cacheLocation}`); | ||
| if (this.progress && this.log) { |
There was a problem hiding this comment.
It's fine to check just for this.log (also later, when we may want to unconditionally switch to modern logs, it'll make easier to pick all those conditionals by searching if (this.log)
lib/clean.js
Outdated
| @@ -50,10 +57,19 @@ function cleanupCache() { | |||
| .forEach((file) => { | |||
| promises.push(fse.removeAsync(file)); | |||
| }); | |||
| return BbPromise.all(promises); | |||
| return BbPromise.all(promises) | |||
| .then(() => cleanupProgress && cleanupProgress.remove()) | |||
lib/inject.js
Outdated
| if (this.serverless.service.package.individually) { | ||
| return BbPromise.resolve(this.targetFuncs) | ||
| returnPromise = BbPromise.resolve(this.targetFuncs) |
There was a problem hiding this comment.
Why not simply convert it to async function, and use finally?
lib/layer.js
Outdated
| return BbPromise.bind(this) | ||
| .then(zipRequirements) | ||
| .then(createLayers) | ||
| .then(() => layerProgress && layerProgress.remove()) |
lib/zip.js
Outdated
| ).then((zip) => writeZip(zip, `${f.module}/.requirements.zip`)); | ||
| return addTree(new JSZip(), `.serverless/${f.module}/requirements`) | ||
| .then((zip) => writeZip(zip, `${f.module}/.requirements.zip`)) | ||
| .then(() => packProgress && packProgress.remove()) |
medikoo
reviewed
Nov 25, 2021
| /^python.*/ | ||
| try { | ||
| if (this.serverless.service.package.individually) { | ||
| await BbPromise.resolve(this.targetFuncs) |
There was a problem hiding this comment.
It should return await to work in same way (but not sure, maybe it won't make difference)
There was a problem hiding this comment.
I've skipped that return because the result is not actually used anywhere
| ); | ||
| }); | ||
| } else if (!this.options.zip) { | ||
| await injectRequirements( |
lib/zip.js
Outdated
| .then((zip) => | ||
| writeZip(zip, path.join(this.servicePath, '.requirements.zip')) | ||
| ) | ||
| .then(() => packProgress && packProgress.remove()) |
pgrzesik
force-pushed
the
add-modern-logs
branch
from
9bda1d4 to
3279861
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Configured in a way that would allow support both for v2 and v3 versions of the Framework