Skip to content

Commit ab3d7a2

Browse files
committed
refactor: Adapt inject to modern logs
1 parent b30ab7c commit ab3d7a2

File tree

1 file changed

+19
-3
lines changed

1 file changed

+19
-3
lines changed

lib/inject.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,19 @@ function injectAllRequirements(funcArtifact) {
9292
return BbPromise.resolve();
9393
}
9494

95-
this.serverless.cli.log('Injecting required Python packages to package...');
95+
let injectProgress;
96+
if (this.progress) {
97+
injectProgress = this.progress.get('python-inject-requirements');
98+
injectProgress.update('Injecting required Python packages to package', {
99+
isMainEvent: true,
100+
});
101+
} else {
102+
this.serverless.cli.log('Injecting required Python packages to package...');
103+
}
96104

105+
let returnPromise;
97106
if (this.serverless.service.package.individually) {
98-
return BbPromise.resolve(this.targetFuncs)
107+
returnPromise = BbPromise.resolve(this.targetFuncs)
99108
.filter((func) =>
100109
(func.runtime || this.serverless.service.provider.runtime).match(
101110
/^python.*/
@@ -132,12 +141,19 @@ function injectAllRequirements(funcArtifact) {
132141
);
133142
});
134143
} else if (!this.options.zip) {
135-
return injectRequirements(
144+
returnPromise = injectRequirements(
136145
path.join('.serverless', 'requirements'),
137146
this.serverless.service.package.artifact || funcArtifact,
138147
this.options
139148
);
140149
}
150+
151+
return returnPromise
152+
.then(() => injectProgress && injectProgress.remove())
153+
.catch((e) => {
154+
injectProgress && injectProgress.remove();
155+
throw e;
156+
});
141157
}
142158

143159
module.exports = { injectAllRequirements };

0 commit comments

Comments
 (0)