Skip to content
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.

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

Reload workers when updating #6

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 23 additions & 8 deletions package-lock.json

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

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
"find-up": "^2.1.0",
"lowdb": "^1.0.0",
"opentmi-jsclient": "git+https://github.com/opentmi/opentmi-jsclient.git#v0.3.0",
"yargs": "^11.0.0"
"yargs": "^11.0.0",
"lodash": "^4.17.5",
"table": "^4.0.2"
},
"devDependencies": {
"eslint": "^4.17.0",
Expand Down
11 changes: 10 additions & 1 deletion src/arguments.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ const yargs = require('yargs');

// app modules
const {authenticateUser, logoutUser} = require('./cmds/login');
const {showVersion, updateVersion} = require('./cmds/update');
const {showVersion} = require('./cmds/show');
const {updateVersion} = require('./cmds/update');
const {reloadWorkers} = require('./cmds/reload');
const {listenResults} = require('./cmds/listen');
const config = require('./config');


Expand All @@ -18,6 +21,12 @@ yargs.usage('Usage: $0 <command> [options]')
.command('update', 'Update something from server', argv =>
argv
.command('version <revision>', 'Update server version', () => {}, updateVersion))
.command('reload', 'Reload something from server', argv =>
argv
.command('workers', 'Reload workers', () => {}, reloadWorkers))
.command('listen', 'Listen events', argv =>
argv
.command('results', 'Listen new results', () => {}, listenResults))
.config(config.getState())
.demandCommand()
.alias('h', 'help')
Expand Down
60 changes: 60 additions & 0 deletions src/cmds/listen.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
const _ = require('lodash');
const {Transport} = require('opentmi-jsclient');
const {createStream} = require('table');


const untilSignal = (signal='SIGINT') => {
console.log(`listening until ${signal}..`);
return new Promise((resolve) => {
process.on(signal, resolve);
});
};

const colored = (value) => {
const reset ='\x1B[49m';
const red = '\x1B[41m';
const green = '\x1B[42m';
const yellow = '\x1B[43m';

const map = {
pass: green,
fail: red,
inconclusive: yellow
};
const color = _.get(map, value, yellow);
return `${color}${value}${reset}`
};


const listenResults = (argv) => {
const transport = new Transport(argv.host);
transport.token = argv.token;

console.log(`Start listening new results`);
const config = {
columnDefault: {
width: 50
},
columnCount: 2
};
const stream = createStream(config);
transport
.connect('/results')
.then(() => transport.sio('/results'))
.then((sio) => {
sio.on('new', (result) => {
const tc = result.tcid;
const verdict = colored(_.get(result, 'exec.verdict'));
stream.write([tc, verdict]);
});
return untilSignal();
})
.then(() => {
transport.disconnect();
});
};


module.exports = {
listenResults
};
17 changes: 17 additions & 0 deletions src/cmds/reload.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const {Transport, Admin} = require('opentmi-jsclient');

const reloadWorkers = (argv) => {
const transport = new Transport(argv.host);
transport.token = argv.token;
const admin = new Admin(transport);
console.log('Start reloading workers..');
return admin.reloadWorkers()
.then(() => { console.log(`Reload success`); })
.catch((error) => {
console.error(`failed: ${error.message}`);
});
};

module.exports = {
reloadWorkers
};
16 changes: 16 additions & 0 deletions src/cmds/show.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
const {Transport, Admin} = require('opentmi-jsclient');

const showVersion = (argv) => {
const transport = new Transport(argv.host);
transport.token = argv.token;
const admin = new Admin(transport);
admin.version()
.then(ver => console.log(ver))
.catch((error) => {
console.error(`failed: ${error.message}`);
});
};

module.exports = {
showVersion
};
31 changes: 16 additions & 15 deletions src/cmds/update.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
const {Transport, Admin} = require('opentmi-jsclient');

const showVersion = (argv) => {
const transport = new Transport(argv.host);
transport.token = argv.token;
const admin = new Admin(transport);
admin.version()
.then(ver => console.log(ver))
.catch((error) => {
console.error(`failed: ${error.message}`);
});
};

const updateVersion = (argv) => {
const version = argv.revision;
const transport = new Transport(argv.host);
transport.token = argv.token;
const admin = new Admin(transport);
console.log(`Start updating to ${version}`);
admin.upgrade(version)
.then(ver => console.log(`Backend updated to ${ver}`))
.catch((error) => {
console.error(`failed: ${error.message}`);
transport
.connect()
.then(() => transport.sio())
.then((sio) => {
sio.on('status', (status) => {
console.log(status);
});
return admin.upgrade(version)
.then(ver => console.log(`Backend updated to ${JSON.stringify(ver)}`))
.catch((error) => {
console.error(`failed: ${error.message}`);
});
})
.then(() => {
transport.disconnect();
});
};


module.exports = {
showVersion,
updateVersion
};