Commit Graph

1003 Commits

Author SHA1 Message Date
55dbaa49c0 Logging target must be explicitly defined.
Whether the log-file should be written to the filesystem or to
shared memory must now be explicitly defined when calling
skygw_logmanager_init() (instead of passing that via the argc/argv
construct).

Also, the meaning of '-l' when invoking maxscale has been changed.

Earlier -l [file|shm] specified whether the trace and debug logs
should be written to shared memory (while the error and message
logs always were written to the filesystem) and the _default_
was to write them to shared memory.

Now, with only one file, '-l' has still the same meaning, but it
decides whether the one and only logfile should be written to shared
memory, or the filesystem and the _default_ is to write it to the
filesystem.
2015-11-11 13:47:34 +02:00
450078fa92 Interface of skygw_logmanager_init(int argc, char* argv[]) changed.
The previous interface of skygw_logmanager_init was conceptually
broken. With -o you could specify that logging should be done to
stdout. However, even if you did that, the log manager still checked
that the logging directory could be accessed. Unless it had been
specified using -j <path> the default was /var/log/maxscale.

That is, unless the program calling skygw_logmanager_init was invoked
by a user that had write access to /var/log/maxscale, there would be
a complaint even if nothing was ever written to that directory.
In practice this meant that even if -o was used you had to provide
a -j with a path that surely is writeable (e.g. "/tmp").

This has now been changed so that you explicitly must provide the
log directory and the flags -j and -o are removed.

  bool skygw_logmanager_init(const char* logdir, int argc, char* argv[]);

If /logdir/ is provided then logged messages are written to a log file
in that directory. If /logdir/ is NULL then messages are logged to stdout
and no checks for access to any directory is not made.
2015-11-06 14:20:05 +02:00
b19a4b9f4a Commands for enabling the log priority added to maxadmin.
Enabling log files is accepted but deprecated.
2015-11-06 10:06:54 +02:00
33294e4c95 Whitespace and indentation changes.
- Tabs replaced with spaces.
- Indentation level 4 spaces.
- Allman braces (except for part of commands)
- Space after ,
- Spaces around binary operators.

No other changes.
2015-11-06 10:06:35 +02:00
c37b33c60e Merge branch '1.2.1-binlog_router_trx' into develop 2015-11-04 16:42:30 +01:00
685e674009 Log message update
Log message update
2015-11-04 16:41:27 +01:00
d51ac7ab7d Disconnect slave when pos is UNSAFE
Disconnect slave when pos is UNSAFE instead of sending an error that
stops the replication
2015-11-04 16:24:46 +01:00
834a88aeda Log variables moved to log_manager.h
The log manager variables lm_enabled_log_files_bitmask, log_ses_count
and tls_log_info that earlier were declared separately in every
c-file are now declared in the log_manager.h header.
2015-11-04 14:26:53 +02:00
0accf869de Fix to MXS-365: https://mariadb.atlassian.net/browse/MXS-365 Added tracking of LOAD DATA LOCAL INFILE
While a LOAD DATA LOCAL INFILE query is being executed, all queries will be sent to the master
and they will not be processed as normal packets.
2015-11-04 12:47:55 +02:00
d6230e68ef Moved warnings about session command history limits to message log. 2015-11-04 09:12:37 +02:00
2594c83117 Missing format specified added. 2015-11-03 14:21:20 +02:00
99ac4876f4 Fixed wrong variables being passed. 2015-11-03 12:16:22 +02:00
a969de7d50 Changed unnecessary strncpy to strcpy. 2015-11-03 12:16:22 +02:00
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
50b0a9b71b Code changes based on review of 1e8afe5063134b7c56492b3777ae1248b1587ba4 2015-11-03 12:16:22 +02:00
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
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
7c582f91ea Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-11-02 18:09:59 +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
a718c995ae Added blr_print_binlog_details
Added blr_print_binlog_details
2015-10-27 17:33:15 +01: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
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
40ffe21dd8 Added a variable for current event being processed after a transaction is committed. 2015-10-23 12:33:51 +03:00
add1927781 Reformatted to make line-length < 110. 2015-10-21 09:46:52 +03:00
eeefd73623 Changed sprintf format to use %02hhx instead of %02x. 2015-10-20 16:20:54 +03:00
a8f866d372 Message log update
Message log update
2015-10-19 11:37:20 +02:00
75e8033052 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-10-19 09:36:04 +02:00
9b65e0b8b6 Fixed compiler warnings. 2015-10-14 10:58:32 +03:00
7e1034a740 All conflicts are printed when processing databases. 2015-10-05 10:20:58 +03:00
6227d9f834 Cleaned up schemarouter code. 2015-10-05 10:20:58 +03:00
a576606f2b Updated schemarouter duplicate DB code based on code review. 2015-10-05 10:20:58 +03:00
af2bc91383 Cleaned up the clientReply function of the schemarouter. 2015-10-05 10:20:58 +03:00
bff6db96a1 Same database on more than one server now cause the schemarouter session to be closed. 2015-10-05 10:20:58 +03:00
62477c5760 Changed log message for trx_safe set to ON
Changed log message for trx_safe set to ON
2015-10-02 19:14:47 +02:00
78252fcb78 Message logs changed for slave request errors
Log messages changed for slave request errors
2015-10-02 18:30:19 +02:00
1e76de540f Added blr_distribute_error_message when distributing transaction events
Added blr_distribute_error_message when distributing transaction events
2015-10-02 09:46:52 +02:00
d31e081e45 Changed log messages for blr_read_binlog, added slave send error feaure
Changed log messages for blr_read_binlog, added slave send error feaure.

When blr_read_binlog detects an error an error message with 1236 code
is sent to the slave and it will stop the replication to binlogrouter
2015-10-01 17:03:48 +02:00
e043d204b4 blr_send_custom_error with errno and state
blr_send_custom_error with errno and state
2015-09-30 15:59:48 +02:00
680589ed46 Slave heartbeat period is reported in diagnostics
Slave heartbeat period is reported in diagnostics only if router option
is set
2015-09-30 15:21:18 +02:00
21509616e9 Fix routine argument type
Fix routine argument type
2015-09-30 14:47:48 +02:00
f9ee9ca028 Addition of send_slave_heartbeat option
Addition of send_slave_heartbeat option
2015-09-30 14:39:26 +02:00