Skip to content

Commit 6387b96

Browse files
authored
Remove --worker option from deepforge start. Closes #1599 (#1600)
* Remove --worker option from deepforge start. Closes #1599 * Remove old --worker test * Remove Dockerfile.worker * WIP Update start worker function * Only wait for "Connected" * Remove worker config options * Update package-lock.json * A couple test fixes to minimize cascading failures * dont customize server port * debugging worker not starting * Add more debug logs... * even more debug logs. Why is this failing on travis only??? * Add logs for time and worker value * Increase timeout and remove debug logs
1 parent 4578909 commit 6387b96

9 files changed

Lines changed: 496 additions & 782 deletions

File tree

bin/config.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
"blob": {
33
"dir": "~/.deepforge/blob"
44
},
5-
"worker": {
6-
"cache": {
7-
"useBlob": true,
8-
"dir": "~/.deepforge/worker/cache"
9-
},
10-
"dir": "~/.deepforge/worker"
11-
},
125
"mongo": {
136
"dir": "~/.deepforge/data"
147
}

bin/deepforge

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ program.command('start')
275275
.option('-p, --port <port>', 'specify the port to use')
276276
.option('-s, --server', 'start the server')
277277
.option('-N, --no-conda', 'do not start deepforge server in a conda environment.')
278-
.option('-w, --worker [url]', 'start a worker and connect to given url. Defaults to local deepforge')
279278
.option('-m, --mongo', 'start MongoDB')
280279
.action(async args => {
281280
const serverCommand = getDeepForgeServerCommand(args.conda);
@@ -296,21 +295,11 @@ program.command('start')
296295
});
297296
}
298297

299-
if (args.worker) {
300-
const main = path.join(__dirname, 'start-worker.js');
301-
if (args.worker !== true) {
302-
await spawn('node', [main, args.worker]);
303-
} else {
304-
await spawn('node', [main]);
305-
}
306-
}
307-
308-
if (!args.server && !args.worker && !args.mongo) {
309-
// Starting everything
298+
const startAll = !args.server && !args.mongo;
299+
if (startAll) {
310300
await checkMongo(args);
311301
startLocal(serverCommand);
312302
}
313-
314303
});
315304

316305
// update

bin/envConfig.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
{
2-
"DEEPFORGE_BLOB_DIR": "blob.dir",
3-
"DEEPFORGE_WORKER_CACHE": "worker.cache.dir",
4-
"DEEPFORGE_WORKER_DIR": "worker.dir",
5-
"DEEPFORGE_WORKER_USE_BLOB": "worker.cache.useBlob"
2+
"DEEPFORGE_BLOB_DIR": "blob.dir"
63
}

bin/start-worker.js

Lines changed: 0 additions & 99 deletions
This file was deleted.

docker/Dockerfile.worker

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)