From f80f8ce26df5d716cf3c5ec08848589d05580590 Mon Sep 17 00:00:00 2001
From: MassimilianoPinto <massimiliano.pinto@skysql.com>
Date: Wed, 28 May 2014 10:06:49 +0200
Subject: [PATCH] monitorID and monitor_interval

monitorID and monitor_interval
---
 server/core/config.c    | 30 +++++++++++++++++++++++++++++-
 server/include/config.h |  2 ++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/server/core/config.c b/server/core/config.c
index be38314ab..487e705f8 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -31,6 +31,7 @@
  * 11/03/14	Massimiliano Pinto	Added Unix socket support
  * 11/05/14	Massimiliano Pinto	Added version_string support to service
  * 19/05/14	Mark Riddoch		Added unique names from section headers
+ * 23/05/14	Massimiliano Pinto	Added automatic set of maxscale-id: first listening ipv4_raw + port + pid
  *
  * @endverbatim
  */
@@ -494,18 +495,37 @@ int			error_count = 0;
 			char *servers;
 			char *user;
 			char *passwd;
+			unsigned long interval = 0;
 
                         module = config_get_value(obj->parameters, "module");
 			servers = config_get_value(obj->parameters, "servers");
 			user = config_get_value(obj->parameters, "user");
 			passwd = config_get_value(obj->parameters, "passwd");
+			if (config_get_value(obj->parameters, "monitor_interval")) {
+				interval = strtoul(config_get_value(obj->parameters, "monitor_interval"), NULL, 10);
+			}
 
                         if (module)
 			{
 				obj->element = monitor_alloc(obj->object, module);
 				if (servers && obj->element)
 				{
-					char *s = strtok(servers, ",");
+					char *s;
+
+					/* if id is not set, compute it now with pid only */
+					if (gateway.id == 0) {
+						gateway.id = getpid();
+					}
+
+					/* add the maxscale-id to monitor data */
+					monitorSetId(obj->element, gateway.id);
+
+					/* set monitor interval */
+					if (interval > 0)
+						monitorSetInterval(obj->element, interval);
+
+					/* get the servers to monitor */
+					s = strtok(servers, ",");
 					while (s)
 					{
 						CONFIG_CONTEXT *obj1 = context;
@@ -747,6 +767,7 @@ global_defaults()
 		gateway.version_string = strdup(version_string);
 	else
 		gateway.version_string = NULL;
+	gateway.id=0;
 }
 
 /**
@@ -1004,6 +1025,7 @@ SERVER			*server;
 			char *protocol;
 			char *address;
 			char *socket;
+			struct sockaddr_in serv_addr;
 
                         service = config_get_value(obj->parameters, "service");
 			address = config_get_value(obj->parameters, "address");
@@ -1011,6 +1033,12 @@ SERVER			*server;
 			protocol = config_get_value(obj->parameters, "protocol");
 			socket = config_get_value(obj->parameters, "socket");
 
+			/* if id is not set, do it now */
+			if (gateway.id == 0) {
+				setipaddress(&serv_addr.sin_addr, (address == NULL) ? "0.0.0.0" : address);
+				gateway.id = (unsigned long) (serv_addr.sin_addr.s_addr + port + getpid());
+			}
+
                         if (service && socket && protocol)
 			{
 				CONFIG_CONTEXT *ptr = context;
diff --git a/server/include/config.h b/server/include/config.h
index 9331739f6..dc94e3ad9 100644
--- a/server/include/config.h
+++ b/server/include/config.h
@@ -28,6 +28,7 @@
  * Date		Who			Description
  * 21/06/13	Mark Riddoch		Initial implementation
  * 07/05/14	Massimiliano Pinto	Added version_string to global configuration
+ * 23/05/14	Massimiliano Pinto	Added id to global configuration
  *
  * @endverbatim
  */
@@ -78,6 +79,7 @@ typedef struct	config_context {
 typedef struct {
 	int			n_threads;		/**< Number of polling threads */
 	char			*version_string;	/**< The version string of embedded database library */
+	unsigned long		id;			/**< MaxScale ID */
 } GATEWAY_CONF;
 
 extern int	    config_load(char *);