4194 Commits

Author SHA1 Message Date
Johan Wikman
865162dc54 Removed getopt options. 2015-11-04 10:29:42 +02:00
Johan Wikman
d7af979ad9 Removed obsolete functionality.
No need for debug, trace or messages prefixes or suffixes.
2015-11-04 10:29:42 +02:00
Markus Makela
d57b4cd531 Fix to MXS-54: https://mariadb.atlassian.net/browse/MXS-54
Added a new configuration parameter that allows the user to control
whether authentication warning messages are logged.
2015-11-04 09:18:20 +02:00
Markus Makela
d6230e68ef Moved warnings about session command history limits to message log. 2015-11-04 09:12:37 +02:00
Johan Wikman
f17803e892 Only one log_file.
The array of log_files replaced with single instance.
2015-11-03 23:27:51 +02:00
Johan Wikman
633f06cddd The notion of a particular file being enabled is removed.
The one and only message file is always enabled.
2015-11-03 22:52:20 +02:00
Johan Wikman
3348fab3c4 Only error log is created.
Only the error log is created anymore. The data structures for
the other files still exist, but they are to be removed next.
2015-11-03 22:34:03 +02:00
Johan Wikman
8798475a46 Some re-arranging of functionality.
Some thread specific functionality moved from thr_flush_file
to the caller thr_filewriter_fun.
2015-11-03 21:50:34 +02:00
Johan Wikman
4de363e8dd Some log refactoring.
Some log manager refactoring to make it easier to later remove
all files but the error log.

Basically all that was done was to move everything inside the
for-loop of thr_filewriter_fun into a separate function called
thr_flush_file. Otherwise no changes in functionality was made.
2015-11-03 16:05:29 +02:00
Johan Wikman
9050fce3d4 It only makes sense to flush/rotate the error log.
The other log files are not used.
2015-11-03 14:23:31 +02:00
Johan Wikman
9ba6ad81b0 Some gotos removed. 2015-11-03 14:21:20 +02:00
Johan Wikman
2594c83117 Missing format specified added. 2015-11-03 14:21:20 +02:00
Markus Makela
2d0a96848c Added table of contents to configuration guide. 2015-11-03 14:12:17 +02:00
Markus Makela
99ac4876f4 Fixed wrong variables being passed. 2015-11-03 12:16:22 +02:00
Markus Makela
a969de7d50 Changed unnecessary strncpy to strcpy. 2015-11-03 12:16:22 +02:00
Markus Makela
3903c4a35d Renamed and moved variables around
Renamed variables to make more sense and reordered them to be more in line with
the function's purpose.
2015-11-03 12:16:22 +02:00
Markus Makela
50b0a9b71b Code changes based on review of 1e8afe5063134b7c56492b3777ae1248b1587ba4 2015-11-03 12:16:22 +02:00
Markus Makela
d5c38b93f6 Fix to MXS-431: https://mariadb.atlassian.net/browse/MXS-431
Replaced the use of the shared MySQLSession structure with an internal variable
that tracks the currently active database.
2015-11-03 12:16:22 +02:00
Markus Makela
18c53bebf1 Fix to MXS-430: https://mariadb.atlassian.net/browse/MXS-430
Added caching of the hashtables used to map databases to servers.
2015-11-03 12:16:22 +02:00
Johan Wikman
6d1c069d41 A bitmask of logfiles is now only logged once. 2015-11-03 11:15:29 +02:00
Markus Makela
9cd327a783 Fix to MXS-417: https://mariadb.atlassian.net/browse/MXS-417 Added support for single-character wildcard in IP addresses.
Single character wildcard addresses are now properly handled
2015-11-03 10:15:34 +02:00
Markus Makela
42f5fe2485 Removed unnecessary files. 2015-11-02 18:11:37 +02:00
Markus Makela
7c582f91ea Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-11-02 18:09:59 +02:00
Markus Makela
9b4e8223b4 Removed double check of database name on login.
Removed redundant check of the default database when a user with proper
credentials is being authenticated.
2015-11-02 15:54:46 +02:00
Markus Makela
24ee9ca675 Removed redundant log messages
Moved logging from functions that perform user authentication to the code that
uses these functions. This way the messages are only logged once.
2015-11-02 15:53:02 +02:00
Johan Wikman
142c22c2a8 The enabling/disabling of log written to error.log
A change on the path of removing all logs but error.log.
2015-11-02 14:53:35 +02:00
Markus Makela
0d8faa6840 Invalid thread argument now results in shutdown.
This is done to avoid situations where the loaded configuration doesn't
match the contents of maxscale.cnf.
2015-11-02 12:00:08 +02:00
Markus Makela
529e697eaf Updated code based on review of ac308dcb2c34e081f9814ad40c0961a217c86fc4
Removed unnecessary spinlock and added more checks.
2015-11-02 12:00:08 +02:00
Markus Makela
6810ed15dd Fix to MXS-436: https://mariadb.atlassian.net/browse/MXS-436
Added autodetection of processor cores and used it as the default if an
invalid value is used for threads.
2015-11-02 12:00:08 +02:00
Johan Wikman
112e21d507 MAXSCALE_ macros renames to MXS_
Markus boldly introduced mxs as an abbreviation for Maxscale.
MXS_ is less wieldy than MAXSCALE_ for logging macros.
2015-11-02 10:11:59 +02:00
markus456
5805eace2e Merge pull request #99 from mariadb-corporation/willfong-patch-3
Multiple Edits
2015-11-02 10:01:43 +02:00
Markus Makela
3187f2c3f8 Updated code based on review of 9a04984 2015-10-31 10:34:37 +02:00
Markus Makela
cd55f62051 Fix to MXS-29: https://mariadb.atlassian.net/browse/MXS-29
If MAXSCALE_SCHEMA.REPLICATION_HEARTBEAT isn't replicated, a warning is logged.
2015-10-31 10:34:37 +02:00
Markus Makela
c1eb84b377 Added utility functions for regular expression matching with the PCRE2 library. 2015-10-31 10:34:37 +02:00
Johan Wikman
3da1769d12 skygw_log_flush no longer calls logmanager_write_log. 2015-10-30 15:26:10 +02:00
Johan Wikman
217a0ae406 Making logmanager_write_log into less of a kitchen-sink.
logmanager_write_log did three different things - logged a message,
flushed a file and rotated a file - none of which were performed
in one go. Hence there's no reason to do all those things in that
function.
2015-10-30 15:08:46 +02:00
Johan Wikman
7ac5176b46 Everything logged to one file with severity prefix.
Another step on the road of log manager modifications.

- All messages are now logged to error.log. The other files are
  still created but not used anymore.
- A severity prefix is added, to distinguish between messages logged
  to "different" files:

     LOGFILE_ERROR   => "[Error]:  "
     LOGFILE_MESSAGE => "[Notice]: "
     LOGFILE_TRACE   => "[Info]:   "
     LOGFILE_DEBUG   => "[Debug]   "

  That prefix is not written to syslog.
- When maxscale is built in debug mode, trace and debug messages
  are no longer enabled by default.

Next step is to remove the other files entirelly.
2015-10-30 11:21:51 +02:00
Johan Wikman
b543f36a49 Indentation and whitespace fixes.
There were many combinations of tab-width used so making the
indentation look right in the editor wasn't really possible.

The changes made:
- All tabs replaced with spaces.
- Indentation depth 4.
- , followed by space.
- Most binary operators (*, =, -) surrounded by one space.
- No space following ( or before ).
- Keywords follwed by 1 space.
2015-10-30 10:21:54 +02:00
Johan Wikman
1f22e2854b maxscale_getline moved to config.c
As a general purpose function should be somewhere else, but we
need to sort out what should be where first.
2015-10-30 09:38:40 +02:00
Markus Makela
5507624326 Fixed typo'd sizeof. 2015-10-29 18:19:05 +02:00
Markus Makela
c29858d215 Added a definition for the size of the SSL error message buffer and changed all buffers to use it. 2015-10-29 16:39:38 +02:00
Markus Makela
f819f164b5 Cleaned up dcb_accept_SSL and added missing logging. 2015-10-29 16:39:38 +02:00
Markus Makela
cab5e58045 Fixed SSL initialization for services failing. 2015-10-29 16:39:38 +02:00
Markus Makela
8d6c583a1c Added a check for duplicate sections in the configuration file. 2015-10-29 16:11:08 +02:00
markus456
b43afe65ce Merge pull request #94 from lowenthal-jason/patch-1
Update Hint-Syntax.md
2015-10-29 14:50:12 +02:00
Will Fong
2b8fd85e30 Multiple Edits
Added *'s for consistency
Added monitor_interval to prevent warning in error log
Reworded default cnf location to make it a little easier to read
Typo in log location
2015-10-29 19:02:46 +08:00
Johan Wikman
bea4051ad5 Spread down feature removed.
With only one file, the spreading down idea becomes nonsensical.
Furthermore, it has never been enabled due to some problems.
2015-10-29 11:40:51 +02:00
Johan Wikman
f964938aaf Minor cleanup.
Parameter documentation clarified, same approach followed all through.
2015-10-29 11:39:59 +02:00
Johan Wikman
22c8af4923 Removed obsolete parameters.
Valist is handled before logmanager_write_log is called. So it
is quite unnecessary to always having to pass a valist whether
it is used or not (and not it is never used).
2015-10-28 15:34:34 +02:00
Johan Wikman
90ff0f1fdf Augmentation moved.
Augmentation moved to skygw_log_write_context. The severity prefix
will be added there as well. If all is done on that level, the
amount of memory needed can be figured out in one go. No need to
allocate and copy the message several times.
2015-10-28 15:16:32 +02:00