Skip to content

Commit 15f89af

Browse files
author
Unitech
committed
do not abort test + upgrade dependencies + verify right bun version + add binary info on pm2 startup
1 parent 0b7be6e commit 15f89af

File tree

7 files changed

+23
-6
lines changed

7 files changed

+23
-6
lines changed

bun.lockb

479 Bytes
Binary file not shown.

lib/Daemon.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Daemon.prototype.innerStart = function(cb) {
8383
fmt.field('Process dump file', cst.DUMP_FILE_PATH);
8484
fmt.field('Concurrent actions', cst.CONCURRENT_ACTIONS);
8585
fmt.field('SIGTERM timeout', cst.KILL_TIMEOUT);
86+
fmt.field('Runtime Binary', process.execPath);
8687
fmt.sep();
8788
};
8889

lib/God.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ God.prepare = function prepare (env, cb) {
146146
}
147147

148148
timesLimit(env.instances, 1, function (n, next) {
149-
console.log('WTF')
150149
env.vizion_running = false;
151150
if (env.env && env.env.vizion_running) {
152151
env.env.vizion_running = false;

lib/binaries/CLI.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ var tabtab = require('../completion.js');
1515
var Common = require('../Common.js');
1616
var PM2ioHandler = require('../API/pm2-plus/PM2IO');
1717

18+
var semver = require('semver')
19+
20+
if (cst.IS_BUN === true && semver.lt(process.versions.bun, '1.1.25')) {
21+
throw new Error('PM2 cannot run on Bun version < 1.1.25 (cluster support)')
22+
}
1823

1924
Common.determineSilentCLI();
2025
Common.printVersion();

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,15 @@
172172
"@pm2/js-api": "~0.8.0",
173173
"@pm2/io": "~6.1.0",
174174
"@pm2/pm2-version-check": "latest",
175-
"async": "~3.2.0",
175+
"async": "~3.2.6",
176176
"blessed": "0.1.81",
177177
"chalk": "3.0.0",
178178
"chokidar": "^3.5.3",
179179
"cli-tableau": "^2.0.0",
180180
"commander": "2.15.1",
181181
"croner": "~4.1.92",
182182
"dayjs": "~1.11.5",
183-
"debug": "^4.3.1",
183+
"debug": "^4.3.7",
184184
"enquirer": "2.3.6",
185185
"eventemitter2": "5.0.1",
186186
"fclone": "1.0.11",
@@ -192,7 +192,7 @@
192192
"pm2-deploy": "~1.0.2",
193193
"pm2-multimeter": "^0.1.2",
194194
"promptly": "^2",
195-
"semver": "^7.2",
195+
"semver": "^7.6.2",
196196
"source-map-support": "0.5.21",
197197
"sprintf-js": "1.1.2",
198198
"vizion": "~2.2.1",
@@ -202,7 +202,7 @@
202202
"pm2-sysmonit": "^1.2.8"
203203
},
204204
"devDependencies": {
205-
"mocha": "^10.4.0",
205+
"mocha": "^10.8.0",
206206
"should": "^13.2.3"
207207
},
208208
"bugs": {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM keymetrics/pm2:undefined
2+
3+
RUN mkdir -p /var/app
4+
5+
WORKDIR /var/app
6+
7+
COPY ./package.json /var/app
8+
RUN npm install
9+
## DISTRIBUTION MODE
10+
ENV NODE_ENV=production
11+
COPY . /var/app
12+
CMD ["pm2-docker", "index.js", "--env", "production"]

test/unit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ touch unit_time
5555
D=test/programmatic
5656

5757
# Abort script at first error
58-
set -e
58+
#set -e
5959

6060
runUnitTest $D/path_resolution.mocha.js
6161
runUnitTest $D/modules.mocha.js

0 commit comments

Comments
 (0)