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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-05-04 10:18:48 +03:00
parent eba6c0c596 2bb6c84be0
commit 4a0df97e02
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/server.h
View File

@ -368,7 +368,7 @@ extern void server_set_status_nolock(SERVER *server, uint64_t bit);
extern void server_clear_status_nolock(SERVER *server, uint64_t bit); extern void server_clear_status_nolock(SERVER *server, uint64_t bit);
extern void server_transfer_status(SERVER *dest_server, const SERVER *source_server); extern void server_transfer_status(SERVER *dest_server, const SERVER *source_server);
extern void server_add_mon_user(SERVER *server, const char *user, const char *passwd); extern void server_add_mon_user(SERVER *server, const char *user, const char *passwd);
extern bool server_get_parameter(const SERVER *server, const char *name, char* out, size_t size); extern size_t server_get_parameter(const SERVER *server, const char *name, char* out, size_t size);
extern void server_update_credentials(SERVER *server, const char *user, const char *passwd); extern void server_update_credentials(SERVER *server, const char *user, const char *passwd);
extern DCB* server_get_persistent(SERVER *server, const char *user, const char* ip, const char *protocol, int id); extern DCB* server_get_persistent(SERVER *server, const char *user, const char* ip, const char *protocol, int id);
extern void server_update_address(SERVER *server, const char *address); extern void server_update_address(SERVER *server, const char *address);

3
maxctrl/lib/core.js
View File

@ -105,7 +105,8 @@ program
.demandCommand(1, 'At least one command is required') .demandCommand(1, 'At least one command is required')
.command('*', 'the default command', {}, function(argv) { .command('*', 'the default command', {}, function(argv) {
maxctrl(argv, function() { maxctrl(argv, function() {
return error('Unknown command ' + JSON.stringify(argv._) + '. See output of `help` for a list of commands.') msg = argv._.length == 0 ? 'No command given' : 'Unknown command ' + JSON.stringify(argv._)
return error(msg + '. See output of `help` for a list of commands.')
}) })
}) })

14
server/core/server.cc
View File

@ -964,11 +964,11 @@ static void server_parameter_free(SERVER_PARAM *tofree)
* @param out Buffer where value is stored, use NULL to check if the parameter exists * @param out Buffer where value is stored, use NULL to check if the parameter exists
* @param size Size of @c out, ignored if @c out is NULL * @param size Size of @c out, ignored if @c out is NULL
* *
* @return True if parameter was found * @return Length of the parameter value or 0 if parameter was not found
*/ */
bool server_get_parameter(const SERVER *server, const char *name, char* out, size_t size) size_t server_get_parameter(const SERVER *server, const char *name, char* out, size_t size)
{ {
bool found = false; int len = 0;
SERVER_PARAM *param = server->parameters; SERVER_PARAM *param = server->parameters;
spinlock_acquire(&server->lock); spinlock_acquire(&server->lock);
@ -976,18 +976,14 @@ bool server_get_parameter(const SERVER *server, const char *name, char* out, siz
{ {
if (strcmp(param->name, name) == 0 && param->active) if (strcmp(param->name, name) == 0 && param->active)
{ {
if (out) len = snprintf(out, out ? size : 0, "%s", param->value);
{
snprintf(out, size, "%s", param->value);
}
found = true;
break; break;
} }
param = param->next; param = param->next;
} }
spinlock_release(&server->lock); spinlock_release(&server->lock);
return found; return len;
} }
/** /**