Commit Graph

4349 Commits

Author SHA1 Message Date
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
529e697eaf Updated code based on review of ac308dcb2c34e081f9814ad40c0961a217c86fc4
Removed unnecessary spinlock and added more checks.
2015-11-02 12:00:08 +02:00
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
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
5805eace2e Merge pull request #99 from mariadb-corporation/willfong-patch-3
Multiple Edits
2015-11-02 10:01:43 +02:00
3187f2c3f8 Updated code based on review of 9a04984 2015-10-31 10:34:37 +02:00
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
c1eb84b377 Added utility functions for regular expression matching with the PCRE2 library. 2015-10-31 10:34:37 +02:00
3da1769d12 skygw_log_flush no longer calls logmanager_write_log. 2015-10-30 15:26:10 +02:00
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
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
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
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
5507624326 Fixed typo'd sizeof. 2015-10-29 18:19:05 +02:00
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
f819f164b5 Cleaned up dcb_accept_SSL and added missing logging. 2015-10-29 16:39:38 +02:00
cab5e58045 Fixed SSL initialization for services failing. 2015-10-29 16:39:38 +02:00
8d6c583a1c Added a check for duplicate sections in the configuration file. 2015-10-29 16:11:08 +02:00
b43afe65ce Merge pull request #94 from lowenthal-jason/patch-1
Update Hint-Syntax.md
2015-10-29 14:50:12 +02:00
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
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
f964938aaf Minor cleanup.
Parameter documentation clarified, same approach followed all through.
2015-10-29 11:39:59 +02:00
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
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
c37e18e3d2 Moved included headers back to .c file 2015-10-28 15:07:50 +02:00
8d84deecc5 Updated schemarouter to use PCRE2 and moved includes to the header file. 2015-10-28 15:07:50 +02:00
99720ffa9f Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-10-28 10:15:52 +01:00
3c30827f16 Report blr_print_binlog_details only if pos > 4
Report blr_print_binlog_details only if  pos > 4
2015-10-28 10:15:05 +01:00
d7d009f3b3 Merge from develop
Merge from develop
2015-10-28 09:38:31 +01:00
4c0406a69c New logging macros
This commit is only to introduce new logging macros.

The current implementation is such that a statement like:

    MAXSCALE_NOTICE("Refreshing configuration following SIGHUP\n");

is equivalent with

    LOGIF(LM, (skygw_log_write(
                LOGFILE_MESSAGE,
                "Refreshing configuration following SIGHUP\n")));

The actual implementation will later be changed as the logging
mechanism itself is changed.

The names of the macros are now according to the levels of syslog
and currently the mapping is like:

    MAXSCALE_ERROR   (Syslog LOG_ERR)     -> LOGFILE_ERROR
    MAXSCALE_WARNING (Syslog LOG_WARNING) -> LOGFILE_ERROR
    MAXSCALE_NOTICE  (Syslof LOG_NOTICE)  -> LOGFILE_MESSAGE
    MAXSCALE_INFO    (Syslog LOG_INFO)    -> LOGFILE_TRACE
    MAXSCALE_DEBUG   (Syslog LOG_DEBUG)   -> LOGFILE_DEBUG

When log manager is changed to deal "natively" with syslog levels
this mapping will disappear of course.
2015-10-28 10:01:24 +02:00
846816a851 Changed from POSIX regular expressions to PCRE2 for the regexfilter. 2015-10-27 22:10:49 +02:00
c798961f21 Removed policy CMP0026 from PCRE2 CMakeLists.txt
The CMP0026 policy causes the build to fail on CMake 2.8.12 and it isn't critical
to the functionality of the library.
2015-10-27 20:55:32 +02:00
08edfe3d6e Added missing cmake files. 2015-10-27 20:51:45 +02:00
a718c995ae Added blr_print_binlog_details
Added blr_print_binlog_details
2015-10-27 17:33:15 +01:00
bad61b0740 Change binlog router to indicate it does not use router sessions via the getCapabilities interface. 2015-10-27 14:17:06 +00:00
9064212353 Fixed queries without assignment operators failing to be properly canonized. 2015-10-27 14:20:43 +02:00
bed6666338 Fix to MXS-367: https://mariadb.atlassian.net/browse/MXS-367
Template config file is copied as maxscale.cnf if no configuration file is found.
If /etc/maxscale.cnf is not found, the /etc/maxscale.cnf.template will be copied as /etc/maxscale.cnf.
This allows MaxScale to start right after installation if combined with a running and properly configured server.
2015-10-27 09:31:55 +02:00
ee29e85016 Added bundled PCRE2 library. 2015-10-27 09:24:34 +02:00
91bb3b288c Moved common monitor code to monitor_common.c 2015-10-26 17:31:19 +02:00
2b958bad94 Added detection of connection timeout when monitors connect to backend servers. 2015-10-26 17:30:34 +02:00
ddcfe03c15 Removed duplicate code. 2015-10-26 15:16:54 +02:00
f2c5df703b Added an ellipsis at the end of a log message that exceeds the maximum size. 2015-10-26 12:15:24 +02:00
a066b34e8e Fix for change master to new binlog file
Fix for change master to new binlog file
2015-10-26 10:35:33 +01:00
6c6f81abce Fix to MXS-427: https://mariadb.atlassian.net/browse/MXS-427
Stack allocated buffers now have a maximum size.
2015-10-26 10:06:20 +02:00
8208f3a728 strerror_r update
strerror_r update
2015-10-23 18:44:39 +02:00
4b923ce4bc Merge branch '1.2.1-binlog_router_trx' of https://github.com/mariadb-corporation/MaxScale into 1.2.1-binlog_router_trx 2015-10-23 16:44:21 +03:00
bf6286e598 Fix for new file creation after change master to new log file
Fix for new file creation after change master to new log file
2015-10-23 15:35:48 +02:00
3be5238bd7 Fixed indentation. 2015-10-23 15:05:51 +03:00
63f4bc3aec Changed from router->binlog_lock to router->lock for transaction safety code and cleaned up code. 2015-10-23 14:54:08 +03:00
1dc48f5ed8 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-10-23 13:18:11 +02:00