Merge branch 'develop' into MAX-324

Conflicts:
	utils/skygw_utils.cc

log_manager/log_manager.cc

@@ -52,6 +52,8 @@ static int prevval;
 static simple_mutex_t msg_mutex;
 #endif
 static int highprec = 0;
+static int do_syslog = 1;
+
 /**
  * Variable holding the enabled logfiles information.
  * Used from log users to check enabled logs prior calling
@@ -392,7 +394,13 @@ static bool logmanager_init_nomutex(
         fw = &lm->lm_filewriter;
         fn->fn_state  = UNINIT;
         fw->fwr_state = UNINIT;
-        
+
+        if(!do_syslog)
+        {
+            free(syslog_id_str);
+            syslog_id_str = NULL;
+        }
+
         /** Initialize configuration including log file naming info */
         if (!fnames_conf_init(fn, argc, argv)) 
 	{
@@ -1703,11 +1711,14 @@ static bool fnames_conf_init(
 
                 case 'l':
                         /** record list of log file ids for syslogged */
+                    if(do_syslog)
+                    {
                         if (syslog_id_str != NULL)
                         {
                                 free (syslog_id_str);
                         }
                         syslog_id_str = optarg;
+                    }
                         break;
 
                 case 'm':
@@ -1720,6 +1731,7 @@ static bool fnames_conf_init(
                         
                 case 's':
                         /** record list of log file ids for later use */
+                    if(do_syslog)
                         shmem_id_str = optarg;
                         break;
                 case 'h':
@@ -3083,7 +3095,21 @@ void skygw_log_sync_all(void)
 	skygw_message_wait(lm->lm_clientmes);
 }
 
+/**
+ * Toggle high precision logging
+ * @param val 0 for disabled, 1 for enabled
+ */
 void skygw_set_highp(int val)
 {
         highprec = val;
+}
+
+
+/**
+ * Toggle syslog logging
+ * @param val 0 for disabled, 1 for enabled
+ */
+void logmanager_enable_syslog(int val)
+{
+    do_syslog = val;
 }

log_manager/log_manager.h

@@ -120,6 +120,7 @@ int  skygw_log_enable(logfile_id_t id);
 int  skygw_log_disable(logfile_id_t id);
 void skygw_log_sync_all(void);
 void skygw_set_highp(int);
+void logmanager_enable_syslog(int);
 EXTERN_C_BLOCK_END
 
 const char* get_trace_prefix_default(void);

server/core/gateway.c

@@ -150,6 +150,7 @@ static struct option long_options[] = {
   {"config",   required_argument, 0, 'f'},
   {"nodaemon", no_argument,       0, 'd'},
   {"log",      required_argument, 0, 'l'},
+  {"syslog",   required_argument, 0, 's'},
   {"version",  no_argument,       0, 'v'},
   {"help",     no_argument,       0, '?'},
   {0, 0, 0, 0}
@@ -995,6 +996,8 @@ static void usage(void)
 		"                    (default: $MAXSCALE_HOME/etc/MaxScale.cnf)\n"
 		"  -l|--log=...      log to file or shared memory\n"
 		"                    -lfile or -lshm - defaults to shared memory\n"
+		"  -s|--syslog=	     log messages to syslog"
+		"		     true or false - defaults to true"
 		"  -v|--version      print version info and exit\n"
                 "  -?|--help         show this help\n"
 		, progname);
@@ -1057,6 +1060,7 @@ int main(int argc, char **argv)
         void*    log_flush_thr = NULL;
 	int      option_index;
 	int	 logtofile = 0;	      	      /* Use shared memory or file */
+	int	 syslog_enabled = 1; /** Log to syslog */
         ssize_t  log_flush_timeout_ms = 0;
         sigset_t sigset;
         sigset_t sigpipe_mask;
@@ -1096,7 +1100,7 @@ int main(int argc, char **argv)
                         goto return_main;
                 }
         }
-        while ((opt = getopt_long(argc, argv, "dc:f:l:v?",
+        while ((opt = getopt_long(argc, argv, "dc:f:l:vs:?",
 				 long_options, &option_index)) != -1)
         {
                 bool succp = true;
@@ -1201,7 +1205,17 @@ int main(int argc, char **argv)
                                 succp = false;
 			}
 			break;
-		  
+		case 's':
+		    if(strstr(optarg,"="))
+		    {
+			strtok(optarg,"= ");
+			syslog_enabled = config_truth_value(strtok(NULL,"= "));
+		    }
+		    else
+		    {
+			syslog_enabled = config_truth_value(optarg);
+		    }
+		    break;
 		case '?':
 		  usage();
 		  rc = EXIT_SUCCESS;
@@ -1563,6 +1577,8 @@ int main(int argc, char **argv)
                 argv[0] = "MaxScale";
                 argv[1] = "-j";
                 argv[2] = buf;
+
+		logmanager_enable_syslog(syslog_enabled);
 		
 		if (logtofile)
 		{

server/core/housekeeper.c

@@ -116,9 +116,20 @@ HKTASK	*task, *ptr;
 		ptr = ptr->next;
 	}
 	if (ptr)
+	{
+	    if (strcmp(ptr->name, name) == 0)
+	    {
+		spinlock_release(&tasklock);
+		free(task->name);
+		free(task);
+		return 0;
+	    }
 		ptr->next = task;
+	}
 	else
+	{
 		tasks = task;
+	}
 	spinlock_release(&tasklock);
 
 	return task->nextdue;

server/modules/include/readwritesplit.h

@@ -290,6 +290,7 @@ struct router_client_session {
         int              rses_capabilities; /*< input type, for example */
         bool             rses_autocommit_enabled;
         bool             rses_transaction_active;
+        DCB* client_dcb;
 #if defined(PREP_STMT_CACHING)
         HASHTABLE*       rses_prep_stmt[2];
 #endif

server/modules/routing/readwritesplit/readwritesplit.c

@@ -790,6 +790,7 @@ static void* newSession(
 #endif
 
 	client_rses->router = router;
+	client_rses->client_dcb = session->client;
         /** 
          * If service config has been changed, reload config from service to 
          * router instance first.
@@ -4353,8 +4354,10 @@ static bool route_session_write(
 		    LOGFILE_TRACE,
 			"Router session exceeded session command history limit. "
 		        "Closing router session. <")));
-		router_cli_ses->rses_closed = true;
+		gwbuf_free(querybuf);
 		rses_end_locked_router_action(router_cli_ses);
+		router_cli_ses->client_dcb->func.hangup(router_cli_ses->client_dcb);
+		
 		goto return_succp;
 	}
 

testall.cmake

@@ -1,4 +1,4 @@
-execute_process(COMMAND /bin/sh -c "${CMAKE_BINARY_DIR}/bin/maxscale -c ${CMAKE_BINARY_DIR} &>/dev/null")
+execute_process(COMMAND /bin/sh -c "${CMAKE_BINARY_DIR}/bin/maxscale -c ${CMAKE_BINARY_DIR} &>/dev/null 2> /dev/null > /dev/null")
 execute_process(COMMAND make test RESULT_VARIABLE RVAL)
 execute_process(COMMAND killall maxscale)
 if(NOT RVAL EQUAL 0)

utils/skygw_utils.cc

@@ -145,12 +145,16 @@ int atomic_add(
         int *variable,
         int value)
 {
+#ifdef __GNUC__
+        return (int) __sync_fetch_and_add (variable, value);
+#else
 	asm volatile(
 		"lock; xaddl %%eax, %2;"
 		:"=a" (value)
 		: "a" (value), "m" (*variable)
 		: "memory" );
 	return value;
+#endif
 }
 
 
@@ -2171,4 +2175,4 @@ strip_escape_chars (char* val)
       cur++;
     }
   return true;
-}
+}