Merge branch 'develop' into monitor_refactoring

server/include/config.h

@@ -18,6 +18,7 @@
  * Copyright MariaDB Corporation Ab 2013-2014
  */
 #include <skygw_utils.h>
+#include <stdint.h>
 #include <openssl/sha.h>
 /**
  * @file config.h The configuration handling elements

server/include/notification.h

@@ -52,6 +52,7 @@ typedef struct {
 	int	feedback_timeout;		/**< An attempt to write/read the data times out and fails after this many seconds */
 	int	feedback_connect_timeout;	/**< An attempt to send the data times out and fails after this many seconds */
 	int	feedback_last_action;		/**< Holds the feedback last send action status */
+        int     feedback_frequency;             /*< Frequency of the housekeeper task */
         char	*release_info;			/**< Operating system Release name */
         char	*sysname;			/**< Operating system name */
         uint8_t	*mac_sha1;			/**< First available MAC address*/

server/include/test_utils.h

@@ -0,0 +1,26 @@
+#ifndef TEST_UTILS_H
+#define TEST_UTILS_H
+#include <poll.h>
+#include <dcb.h>
+#include <housekeeper.h>
+#include <maxscale_test.h>
+#include <log_manager.h>
+
+void init_test_env()
+{
+    int argc = 3;
+    
+    char* argv[] =
+        {
+            "log_manager",
+            "-j",
+            TEST_LOG_DIR,
+            NULL
+        };
+
+    skygw_logmanager_init(argc,argv);
+    poll_init();
+    hkinit();
+}
+
+#endif