From: William Lallemand <wlallemand@haproxy.com>
Date: Sat, 19 Nov 2016 01:00:33 +0000 (+0100)
Subject: REORG: cli: move 'set server' to server.c
X-Git-Tag: v1.7.0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=222baf20dae36f4c0ea2c02919550bee3e530080;p=thirdparty%2Fhaproxy.git

REORG: cli: move 'set server' to server.c

Move 'set server' CLI functions to server.c and use the cli keyword API
to register it on the CLI.
---

diff --git a/src/cli.c b/src/cli.c
index 0a6a68dc11..7c84708103 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -165,7 +165,6 @@ static const char stats_sock_usage_msg[] =
 	"  show servers state [id]: dump volatile server information (for backend <id>)\n"
 	"  get weight     : report a server's current weight\n"
 	"  set weight     : change a server's weight\n"
-	"  set server     : change a server's state, weight or address\n"
 	"  set table [id] : update or create a table entry's data\n"
 	"  set timeout    : change a timeout setting\n"
 	"  set maxconn    : change a maxconn setting\n"
@@ -952,7 +951,7 @@ static struct proxy *expect_frontend_admin(struct stream *s, struct stream_inter
  * and returns NULL. This function also expects the stream level to be admin. Note:
  * the <arg> is modified to remove the '/'.
  */
-static struct server *expect_server_admin(struct stream *s, struct stream_interface *si, char *arg)
+struct server *expect_server_admin(struct stream *s, struct stream_interface *si, char *arg)
 {
 	struct appctx *appctx = __objt_appctx(si->end);
 	struct proxy *px;
@@ -1299,120 +1298,6 @@ static int stats_sock_parse_request(struct stream_interface *si, char *line)
 			}
 			return 1;
 		}
-		else if (strcmp(args[1], "server") == 0) {
-			struct server *sv;
-			const char *warning;
-
-			sv = expect_server_admin(s, si, args[2]);
-			if (!sv)
-				return 1;
-
-			if (strcmp(args[3], "weight") == 0) {
-				warning = server_parse_weight_change_request(sv, args[4]);
-				if (warning) {
-					appctx->ctx.cli.msg = warning;
-					appctx->st0 = STAT_CLI_PRINT;
-				}
-			}
-			else if (strcmp(args[3], "state") == 0) {
-				if (strcmp(args[4], "ready") == 0)
-					srv_adm_set_ready(sv);
-				else if (strcmp(args[4], "drain") == 0)
-					srv_adm_set_drain(sv);
-				else if (strcmp(args[4], "maint") == 0)
-					srv_adm_set_maint(sv);
-				else {
-					appctx->ctx.cli.msg = "'set server <srv> state' expects 'ready', 'drain' and 'maint'.\n";
-					appctx->st0 = STAT_CLI_PRINT;
-				}
-			}
-			else if (strcmp(args[3], "health") == 0) {
-				if (sv->track) {
-					appctx->ctx.cli.msg = "cannot change health on a tracking server.\n";
-					appctx->st0 = STAT_CLI_PRINT;
-				}
-				else if (strcmp(args[4], "up") == 0) {
-					sv->check.health = sv->check.rise + sv->check.fall - 1;
-					srv_set_running(sv, "changed from CLI");
-				}
-				else if (strcmp(args[4], "stopping") == 0) {
-					sv->check.health = sv->check.rise + sv->check.fall - 1;
-					srv_set_stopping(sv, "changed from CLI");
-				}
-				else if (strcmp(args[4], "down") == 0) {
-					sv->check.health = 0;
-					srv_set_stopped(sv, "changed from CLI");
-				}
-				else {
-					appctx->ctx.cli.msg = "'set server <srv> health' expects 'up', 'stopping', or 'down'.\n";
-					appctx->st0 = STAT_CLI_PRINT;
-				}
-			}
-			else if (strcmp(args[3], "agent") == 0) {
-				if (!(sv->agent.state & CHK_ST_ENABLED)) {
-					appctx->ctx.cli.msg = "agent checks are not enabled on this server.\n";
-					appctx->st0 = STAT_CLI_PRINT;
-				}
-				else if (strcmp(args[4], "up") == 0) {
-					sv->agent.health = sv->agent.rise + sv->agent.fall - 1;
-					srv_set_running(sv, "changed from CLI");
-				}
-				else if (strcmp(args[4], "down") == 0) {
-					sv->agent.health = 0;
-					srv_set_stopped(sv, "changed from CLI");
-				}
-				else {
-					appctx->ctx.cli.msg = "'set server <srv> agent' expects 'up' or 'down'.\n";
-					appctx->st0 = STAT_CLI_PRINT;
-				}
-			}
-			else if (strcmp(args[3], "check-port") == 0) {
-				int i = 0;
-				if (strl2irc(args[4], strlen(args[4]), &i) != 0) {
-					appctx->ctx.cli.msg = "'set server <srv> check-port' expects an integer as argument.\n";
-					appctx->st0 = STAT_CLI_PRINT;
-				}
-				if ((i < 0) || (i > 65535)) {
-					appctx->ctx.cli.msg = "provided port is not valid.\n";
-					appctx->st0 = STAT_CLI_PRINT;
-				}
-				/* prevent the update of port to 0 if MAPPORTS are in use */
-				if ((sv->flags & SRV_F_MAPPORTS) && (i == 0)) {
-					appctx->ctx.cli.msg = "can't unset 'port' since MAPPORTS is in use.\n";
-					appctx->st0 = STAT_CLI_PRINT;
-					return 1;
-				}
-				sv->check.port = i;
-				appctx->ctx.cli.msg = "health check port updated.\n";
-				appctx->st0 = STAT_CLI_PRINT;
-			}
-			else if (strcmp(args[3], "addr") == 0) {
-				char *addr = NULL;
-				char *port = NULL;
-				if (strlen(args[4]) == 0) {
-					appctx->ctx.cli.msg = "set server <b>/<s> addr requires an address and optionally a port.\n";
-					appctx->st0 = STAT_CLI_PRINT;
-					return 1;
-				}
-				else {
-					addr = args[4];
-				}
-				if (strcmp(args[5], "port") == 0) {
-					port = args[6];
-				}
-				warning = update_server_addr_port(sv, addr, port, "stats socket command");
-				if (warning) {
-					appctx->ctx.cli.msg = warning;
-					appctx->st0 = STAT_CLI_PRINT;
-				}
-				srv_clr_admin_flag(sv, SRV_ADMF_RMAINT);
-			}
-			else {
-				appctx->ctx.cli.msg = "'set server <srv>' only supports 'agent', 'health', 'state', 'weight', 'addr' and 'check-port'.\n";
-				appctx->st0 = STAT_CLI_PRINT;
-			}
-			return 1;
-		}
 		else if (strcmp(args[1], "timeout") == 0) {
 			if (strcmp(args[2], "cli") == 0) {
 				unsigned timeout;
diff --git a/src/server.c b/src/server.c
index ac66c6bbb0..b07a2fe0ef 100644
--- a/src/server.c
+++ b/src/server.c
@@ -20,10 +20,15 @@
 #include <common/namespace.h>
 #include <common/time.h>
 
+#include <types/applet.h>
+#include <types/cli.h>
 #include <types/global.h>
 #include <types/cli.h>
 #include <types/dns.h>
+#include <types/stats.h>
 
+#include <proto/applet.h>
+#include <proto/cli.h>
 #include <proto/checks.h>
 #include <proto/port_range.h>
 #include <proto/protocol.h>
@@ -31,6 +36,8 @@
 #include <proto/raw_sock.h>
 #include <proto/server.h>
 #include <proto/stream.h>
+#include <proto/stream_interface.h>
+#include <proto/stats.h>
 #include <proto/task.h>
 #include <proto/dns.h>
 
@@ -3381,6 +3388,137 @@ struct server *cli_find_server(struct appctx *appctx, char *arg)
 }
 
 
+static int cli_parse_set_server(char **args, struct appctx *appctx, void *private)
+{
+	struct server *sv;
+	const char *warning;
+
+	if (!cli_has_level(appctx, ACCESS_LVL_ADMIN))
+		return 1;
+
+	sv = cli_find_server(appctx, args[2]);
+	if (!sv)
+		return 1;
+
+	if (strcmp(args[3], "weight") == 0) {
+		warning = server_parse_weight_change_request(sv, args[4]);
+		if (warning) {
+			appctx->ctx.cli.msg = warning;
+			appctx->st0 = STAT_CLI_PRINT;
+		}
+	}
+	else if (strcmp(args[3], "state") == 0) {
+		if (strcmp(args[4], "ready") == 0)
+			srv_adm_set_ready(sv);
+		else if (strcmp(args[4], "drain") == 0)
+			srv_adm_set_drain(sv);
+		else if (strcmp(args[4], "maint") == 0)
+			srv_adm_set_maint(sv);
+		else {
+			appctx->ctx.cli.msg = "'set server <srv> state' expects 'ready', 'drain' and 'maint'.\n";
+			appctx->st0 = STAT_CLI_PRINT;
+		}
+	}
+	else if (strcmp(args[3], "health") == 0) {
+		if (sv->track) {
+			appctx->ctx.cli.msg = "cannot change health on a tracking server.\n";
+			appctx->st0 = STAT_CLI_PRINT;
+		}
+		else if (strcmp(args[4], "up") == 0) {
+			sv->check.health = sv->check.rise + sv->check.fall - 1;
+			srv_set_running(sv, "changed from CLI");
+		}
+		else if (strcmp(args[4], "stopping") == 0) {
+			sv->check.health = sv->check.rise + sv->check.fall - 1;
+			srv_set_stopping(sv, "changed from CLI");
+		}
+		else if (strcmp(args[4], "down") == 0) {
+			sv->check.health = 0;
+			srv_set_stopped(sv, "changed from CLI");
+		}
+		else {
+			appctx->ctx.cli.msg = "'set server <srv> health' expects 'up', 'stopping', or 'down'.\n";
+			appctx->st0 = STAT_CLI_PRINT;
+		}
+	}
+	else if (strcmp(args[3], "agent") == 0) {
+		if (!(sv->agent.state & CHK_ST_ENABLED)) {
+			appctx->ctx.cli.msg = "agent checks are not enabled on this server.\n";
+			appctx->st0 = STAT_CLI_PRINT;
+		}
+		else if (strcmp(args[4], "up") == 0) {
+			sv->agent.health = sv->agent.rise + sv->agent.fall - 1;
+			srv_set_running(sv, "changed from CLI");
+		}
+		else if (strcmp(args[4], "down") == 0) {
+			sv->agent.health = 0;
+			srv_set_stopped(sv, "changed from CLI");
+		}
+		else {
+			appctx->ctx.cli.msg = "'set server <srv> agent' expects 'up' or 'down'.\n";
+			appctx->st0 = STAT_CLI_PRINT;
+		}
+	}
+	else if (strcmp(args[3], "check-port") == 0) {
+		int i = 0;
+		if (strl2irc(args[4], strlen(args[4]), &i) != 0) {
+			appctx->ctx.cli.msg = "'set server <srv> check-port' expects an integer as argument.\n";
+			appctx->st0 = STAT_CLI_PRINT;
+		}
+		if ((i < 0) || (i > 65535)) {
+			appctx->ctx.cli.msg = "provided port is not valid.\n";
+			appctx->st0 = STAT_CLI_PRINT;
+		}
+		/* prevent the update of port to 0 if MAPPORTS are in use */
+		if ((sv->flags & SRV_F_MAPPORTS) && (i == 0)) {
+			appctx->ctx.cli.msg = "can't unset 'port' since MAPPORTS is in use.\n";
+			appctx->st0 = STAT_CLI_PRINT;
+			return 1;
+		}
+		sv->check.port = i;
+		appctx->ctx.cli.msg = "health check port updated.\n";
+		appctx->st0 = STAT_CLI_PRINT;
+	}
+	else if (strcmp(args[3], "addr") == 0) {
+		char *addr = NULL;
+		char *port = NULL;
+		if (strlen(args[4]) == 0) {
+			appctx->ctx.cli.msg = "set server <b>/<s> addr requires an address and optionally a port.\n";
+			appctx->st0 = STAT_CLI_PRINT;
+			return 1;
+		}
+		else {
+			addr = args[4];
+		}
+		if (strcmp(args[5], "port") == 0) {
+			port = args[6];
+		}
+		warning = update_server_addr_port(sv, addr, port, "stats socket command");
+		if (warning) {
+			appctx->ctx.cli.msg = warning;
+			appctx->st0 = STAT_CLI_PRINT;
+		}
+		srv_clr_admin_flag(sv, SRV_ADMF_RMAINT);
+	}
+	else {
+		appctx->ctx.cli.msg = "'set server <srv>' only supports 'agent', 'health', 'state', 'weight', 'addr' and 'check-port'.\n";
+		appctx->st0 = STAT_CLI_PRINT;
+	}
+	return 1;
+}
+
+/* register cli keywords */
+static struct cli_kw_list cli_kws = {{ },{
+	{ { "set", "server", NULL }, "set server     : change a server's state, weight or address",  cli_parse_set_server },
+	{{},}
+}};
+
+__attribute__((constructor))
+static void __server_init(void)
+{
+	cli_register_kw(&cli_kws);
+}
+
 /*
  * Local variables:
  *  c-indent-level: 8