Commit Graph

878 Commits

Author SHA1 Message Date
ad49c5f402 Added optional millisecond precision to logfiles and created the changelog document. 2015-02-24 18:10:16 +02:00
3b29e1a1f0 Fixed merging conflicts. 2015-02-24 06:34:22 +02: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
5477cdf5eb Renamed the dbshard module to schemarouter. 2015-02-24 05:49:38 +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
57f89f5689 Small optimizations to session timeouts. 2015-02-23 19:59:36 +02:00
578fb07370 Added timeout testing to service tests. 2015-02-23 11:13:31 +02:00
56d810ff80 Merge branch 'develop' into timeout 2015-02-23 10:28:55 +02:00
46c4fefb00 Fixes to coverity defects 87601 87557 87548 87547 87546 87545 87544 87536 87535 87529 87528 2015-02-22 22:29:30 +02:00
1d74295e8c Moved a function around. 2015-02-22 21:52:53 +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
83b7948cdf Added more debug output to user authentication. 2015-02-20 14:50:26 +02:00
a022775342 Addition of show eventtimes and /events/times URL to maxinfo 2015-02-20 11:53:47 +00:00
2c401788ee Fix to bug 579: http://bugs.mariadb.com/show_bug.cgi?id=579
Added actual testing routers and protocols.
2015-02-20 12:30:55 +02:00
039d3c4c0b Make JSON result sets produce nmeric valeus without quotes
Updated HTTPD protocol module to return application/json as the encoding
2015-02-20 10:09:01 +00:00
8eb14235d1 Addition of DCB and Poll statistics in show status output 2015-02-20 10:05:50 +00:00
ea55572ab8 Merge branch 'develop' into MAX-324 2015-02-20 04:45:48 +02:00
3924f70d6b Fixed log manager sometimes not writing the last character in a log message.
This was caused by type conversions from int to size_t and the usage of the MAX macro.
2015-02-20 04:42:02 +02:00
df3a548be1 Added basic REST interface to maxinfo plugin 2015-02-19 16:24:30 +00:00
c2cd3f4c3d Merge pull request #73 from tanji/serversjson
Output server list in JSON format
2015-02-19 16:56:02 +02:00
11e65f02f0 Addition of maxinfo show modules and show monitors commands 2015-02-19 13:32:48 +00:00
2f218cba3a Addition of maxinfo commands
show sessions
	show clients
	show listeners
	show services
	show servers
2015-02-19 12:55:39 +00:00
b8b75b604f Make JSON output valid 2015-02-19 13:55:29 +01:00
3898a995ad Addition of show services command 2015-02-19 11:07:24 +00:00
e0e5652f5e Fixed bug in resultset_make_row
Addition of resultset_stream_json
2015-02-19 11:06:31 +00:00
e047247200 Add command to print all servers in JSON format 2015-02-19 10:07:31 +01:00
8e941f7523 Addition of the MaxInfo filter and the generic MaxScale resultset 2015-02-18 17:25:13 +00:00
65e2572ad0 Made config_truth_value non-static. 2015-02-18 13:16:06 +02:00
03456b931b Added "yes" and "no" to the config truth value check and added the function to the header. 2015-02-18 11:45:01 +02:00
da029140cd dcb_call_foreach now only calls the callbacks for those DCBs that are connected to the server. 2015-02-18 05:36:39 +02:00
ce063caf56 Fixed stopped monitors getting a call to monitorStop. 2015-02-17 21:47:11 +02:00
a2bff1dcea Merge branch 'develop' into MAX-324 2015-02-16 14:58:35 +02:00
f54b57d987 Fixed modutil_replace_SQL not modifying the packet length when the replacement was shorter. 2015-02-16 12:10:48 +02:00
9dfa4378b4 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-02-16 09:21:38 +00:00
d7da8c5297 Code cleanup 2015-02-16 09:21:11 +00:00
cd99d6c1dd Fixes to Coverity defects 87073, 87388. 2015-02-16 09:11:55 +02:00
37360eb02e Merge pull request #72 from hholzgra/hartmut-warnings-2nd
"Hartmut warnings 2nd" merged.
2015-02-15 20:26:09 +02:00
eedcd44e95 wrong SPINLOCK type declaration (actual structure, not pointer, needed) 2015-02-14 16:51:03 +01:00
617f44c9c9 use intptr_t type for pointer->integer conversion so that int <-> pointer sizes match 2015-02-14 16:39:05 +01:00
3ecf926092 prevent signed/unsigned conflicts 2015-02-14 15:34:11 +01:00
3bad5dc814 Fixes to Coverity defects 87308, 87307, 87306, 87074, 87068. 2015-02-14 07:54:17 +02:00
2477043d11 Logfiles are now writted to file instead of shared memory as a default.
This can still be enabled while starting maxscale.
2015-02-13 23:59:32 +02:00
56ab0efbb3 include string.h for strdup() prototype 2015-02-13 17:06:47 +01:00
c992b53750 include stdlib.h for malloc() prototype 2015-02-13 17:03:39 +01:00
a3a7aae1d2 add missing return type for main() 2015-02-13 16:57:12 +01:00
6d1a11637a Fixed typo 2015-02-13 10:18:55 +00:00
d1c2895057 Small fix to how user is retrieved from all servers.
When the authentication was done using the user data from all servers and the set of servers contained a server in the Master state it was possible that some servers weren't queried for their users. This was fixed by adding a check for the parameter that enables this before looking for a master server.
2015-02-13 07:34:46 +02:00
36363b09a1 Added more debug logging and fixed the service resources being overwritted even though they were already allocated. 2015-02-10 14:28:49 +02:00
46ec9abe29 Added optional parameters for services that allow all servers to be used when building the list of users. 2015-02-09 07:19:13 +02:00