hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1300: Take the refactored core into use

Browse Source 
The refactored maxctrl function is now in use.
This commit is contained in:
Markus Mäkelä
2017-07-15 06:59:49 +03:00
parent b98b326bba
commit 3255d58e70
18 changed files with 178 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
maxctrl/lib/show.js
View File

@ -19,8 +19,8 @@ exports.handler = function() {}
exports.builder = function(yargs) {
yargs
.command('server <server>', 'Show server', {}, function(argv) {
maxctrl(argv)
.getResource('servers/' + argv.server, [
maxctrl(argv, function(host) {
return getResource(host, 'servers/' + argv.server, [
{'Server': 'id'},
{'Address': 'attributes.parameters.address'},
{'Port': 'attributes.parameters.port'},
@ -33,10 +33,11 @@ exports.builder = function(yargs) {
{'Statistics': 'attributes.statistics'},
{'Parameters': 'attributes.parameters'}
])
})
})
.command('service <service>', 'Show service', {}, function(argv) {
maxctrl(argv)
.getResource('services/' + argv.service, [
maxctrl(argv, function(host) {
return getResource(host, 'services/' + argv.service, [
{'Service': 'id'},
{'Router': 'attributes.router'},
{'State': 'attributes.state'},
@ -47,20 +48,22 @@ exports.builder = function(yargs) {
{'Parameters': 'attributes.parameters'},
{'Router Diagnostics': 'attributes.router_diagnostics'}
])
})
})
.command('monitor <monitor>', 'Show monitor', {}, function(argv) {
maxctrl(argv)
.getResource('monitors/' + argv.monitor, [
maxctrl(argv, function(host) {
return getResource(host, 'monitors/' + argv.monitor, [
{'Monitor': 'id'},
{'State': 'attributes.state'},
{'Servers': 'relationships.servers.data[].id'},
{'Parameters': 'attributes.parameters'},
{'Monitor Diagnostics': 'attributes.monitor_diagnostics'}
])
})
})
.command('session <session>', 'Show session', {}, function(argv) {
maxctrl(argv)
.getResource('sessions/' + argv.session, [
maxctrl(argv, function(host) {
return getResource(host, 'sessions/' + argv.session, [
{'Id': 'id'},
{'Service': 'relationships.services.data[].id'},
{'State': 'attributes.state'},
@ -69,19 +72,21 @@ exports.builder = function(yargs) {
{'Connected': 'attributes.connected'},
{'Idle': 'attributes.idle'}
])
})
})
.command('filter <filter>', 'Show filter', {}, function(argv) {
maxctrl(argv)
.getResource('filters/' + argv.filter, [
maxctrl(argv, function(host) {
return getResource(host, 'filters/' + argv.filter, [
{'Filter': 'id'},
{'Module': 'attributes.module'},
{'Services': 'relationships.services.data[].id'},
{'Parameters': 'attributes.parameters'}
])
})
})
.command('module <module>', 'Show loaded module', {}, function(argv) {
maxctrl(argv)
.getResource('maxscale/modules/' + argv.module, [
maxctrl(argv, function(host) {
return getResource(host, 'maxscale/modules/' + argv.module, [
{'Module': 'id'},
{'Type': 'attributes.module_type'},
{'Version': 'attributes.version'},
@ -90,23 +95,26 @@ exports.builder = function(yargs) {
{'Parameters': 'attributes.parameters'},
{'Commands': 'attributes.commands'}
])
})
})
.command('maxscale', 'Show MaxScale information', {}, function(argv) {
maxctrl(argv)
.getResource('maxscale', [
maxctrl(argv, function(host) {
return getResource(host, 'maxscale', [
{'Version': 'attributes.version'},
{'Commit': 'attributes.commit'},
{'Started At': 'attributes.started_at'},
{'Uptime': 'attributes.uptime'}
])
})
})
.command('commands <module>', 'Show module commands of a module', {}, function(argv) {
maxctrl(argv)
.getSubCollection('maxscale/modules/' + argv.module, 'attributes.commands', [
maxctrl(argv, function(host) {
return getSubCollection(host, 'maxscale/modules/' + argv.module, 'attributes.commands', [
{'Command': 'id'},
{'Parameters': 'attributes.parameters[].type'},
{'Descriptions': 'attributes.parameters[].description'}
])
})
})
.usage('Usage: show <command>')
.help()