49d5409dcb
Merge branch 'develop' into MXS-121
...
Conflicts:
server/modules/monitor/mysql_mon.c
2015-05-09 04:49:06 +03:00
5a3ed0de9b
Moved common monitor functionality to the MONITOR type
...
Common variables, like databases, timeouts and interval, and functionality was moved to the MONITOR type.
This reduces the redundant functionality of the monitor API's functions like registerServer and setInterval.
2015-05-09 04:47:17 +03:00
da6d597987
Moved common monitor structures and definitions to a separate header and added master down script to galeramon.
2015-05-07 05:56:13 +03:00
bb074d8f94
Removed stdout printing of useless messages from maxkeys and maxpasswd.
2015-05-06 21:00:43 +03:00
9c305d95c7
Added a warning about multiple monitors monitoring the same servers.
2015-05-05 13:45:24 +03:00
416ffea9b7
Changed errmsg.sys installation location to /var/lib/maxscale
2015-04-30 10:37:06 +03:00
9e0a2bfc12
Changed relevant files to use get_cachedir() instead of using the now deprecated MAXSCALE_HOME.
2015-04-27 21:55:57 +03:00
1cc6ced505
Updated old references to MAXSCALE_HOME
2015-04-27 15:06:45 +03:00
bbcecc0db5
Changed all MaxScale.cnf code references to maxscale.cnf
2015-04-27 13:44:36 +03:00
0cfcad55da
Moved get_libdir function to its own file.
2015-04-27 11:06:11 +03:00
c500d23d04
Moved default file search paths to gwdirs.h which is configured by CMake from gwdirs.h.in.
2015-04-27 04:48:50 +03:00
17a7b2addb
Updated more variables.
2015-04-26 20:08:27 +03:00
df9bc65430
Added variables that are used when installing instead of relative paths.
2015-04-25 18:35:47 +03:00
eec053924c
Updated various MaxScale command line and configuration options to allow custom log, module, data, cache and language directories.
2015-04-24 22:11:49 +03:00
4b623e3af4
Added percentage conversion functions to maxconfig.h
2015-04-16 21:51:19 +03:00
d16e4fe134
Added an option for optimization of wildcard grants to individual grants. The default behavior now checks first for specific grants to a database the wildcard grants.
2015-04-15 06:51:52 +03:00
89ca0f420a
Added a rule parsing tool for the dbfwfilter. The tool can be build with the -DBUILD_TOOLS=Y flag for CMake.
2015-04-03 10:37:21 +03:00
5fb9353b47
Added session idle time and user name the client is connecting with to the dprintSession and dprintAllSessions functions. Also changed last_read from time_t to unsigned long to match the hkheartbeat.
2015-03-13 08:49:34 +02:00
90875c1164
Cleaned up unused variables.
2015-03-11 18:12:18 +02:00
63d83cd85d
Monitor API 2.0.0 implemented.
2015-03-11 15:18:55 +02:00
9209c812ba
Updates to refactoring of the monitors.
2015-03-11 10:40:53 +02:00
8d8b91d1a5
Merge branch 'develop' into monitor_refactoring
2015-03-11 07:13:01 +02:00
2c31666efa
Added a configurable frequecy for the feedback task.
2015-03-11 06:51:55 +02:00
e937947f01
Added test_utils.h header which contains a testing environment initialization function.
2015-03-10 15:16:52 +02:00
479a2c3a74
stdint.h added to config.h
...
stdint.h added to config.h
2015-03-10 12:03:01 +01:00
c0d2a12990
First step to refactoring monitors.
2015-03-10 12:24:23 +02:00
7af2843bcb
Notification Service integration added
...
Notification Service integration added
2015-03-09 18:06:16 +01:00
02e742f29e
Added unit test for feedback service.
2015-03-09 14:17:40 +02:00
e1a6b1de08
Added _NOTIFICATION_REPORT_ROW_LEN
...
Added _NOTIFICATION_REPORT_ROW_LEN for gwbuf_alloc based on know row
numbers
2015-03-09 09:59:43 +01:00
6a64457255
Fix compiler warning
...
Fix compiler warning
2015-03-09 09:21:59 +01:00
5471d35524
Merge branch 'develop' into MAX-324
...
Conflicts:
server/include/modutil.h
2015-03-09 10:18:59 +02:00
8490f52dd0
Merge branch 'develop' into MAX-348
2015-03-09 09:07:30 +01:00
22849f7c90
Added support for multiple result sets.
2015-03-06 22:40:10 +02:00
2aaa367c37
Merge branch 'develop' into tee_fixes
2015-03-06 18:27:41 +02:00
5bbd9a66fc
Added show feedbackreport
...
Added show feedbackreport
2015-03-06 11:15:06 +01:00
698af9d3b7
Send modules list into to Notification server
...
Send modules list into to Notification server
TODO: remove fprintf in module_feedback_send and use log manager
instead
2015-03-05 13:20:22 +01:00
d98dd6e15f
Fixing errors caused by the merge with develop.
2015-03-05 11:14:12 +02:00
880adca73e
Merge branch 'develop' into MAX-324
2015-03-05 10:45:48 +02:00
0dd63ceaf1
Added release version string function to config.c
2015-03-04 18:48:38 +02:00
bc5dfe82c2
merge from develop
...
merge from develop
2015-03-04 17:02:04 +01:00
1b0fd4576a
Merge branch 'maxinfo' into develop
...
Conflicts:
server/core/service.c
server/core/session.c
server/include/session.h
2015-03-04 11:33:00 +02:00
3b76ed43c4
Added tee filter multi-statement support.
2015-03-04 04:20:46 +02:00
692dd79235
Added binary protocol COM_STMT_PREPARE to modutil_get_SQL.
2015-03-03 14:42:55 +02:00
efda82cbf3
Header file update
...
Header file update
2015-03-02 17:50:29 +01:00
64c0b7b041
Notification service support
...
Notification service support
2015-03-02 17:15:31 +01:00
193fe22ef0
Addition of module_feedback_send
...
Addition of module_feedback_send.
Every 30 second data is sent to 127.0.0.1
Missing routines for configuration parameters and blocking the send
after successful completion
2015-02-26 17:47:01 +01:00
9e7afeb302
Merge branch 'develop' into MAX-324
...
Conflicts:
macros.cmake
server/core/config.c
server/core/service.c
server/modules/routing/CMakeLists.txt
2015-02-24 06:26:55 +02:00
aa4932bf2d
Moved the housekeeper heartbeat to a separate header for ease of integration.
...
This keeps the behavior the same but allows the heartbeat to be used as a crude timer
without including everything the housekeeper.h header includes.
Moved the protocol level updates on the DCBs last_read value into dcb_read.
This keeps the implementation nice and compact.
2015-02-24 05:00:16 +02:00
c47d2f3791
Added session timeouts.
...
The parameter 'connection_timeout' for services takes a value as seconds.
All sessions that have been idle for longer than this will be disconnected.
2015-02-20 22:16:43 +02:00
fc969acc73
Added optional stripping of escape characters from database names when laoding users.
2015-02-20 21:07:12 +02:00
