Merge branch 'develop' into MXS-544

This commit is contained in:
Markus Makela
2016-02-29 10:18:49 +02:00
15 changed files with 211 additions and 127 deletions

View File

@ -12,6 +12,8 @@ You will need a number of tools and libraries in order to achieve this.
* libedit 2.11 or later (used by the MaxAdmin tool)
* Bison and Flex
# Obtaining MariaDB packages
MaxScale requires the server and the development packages for the MariaDB server. Either the 10.0 or the 5.5 version of the MariaDB server can be used. You can obtain these by following the instructions on the MariaDB.org site: [https://downloads.mariadb.org/](https://downloads.mariadb.org/)
@ -27,7 +29,7 @@ The full list of dependencies for the most common distributions is provided in t
You will need to install all of the following packages for all versions of RHEL and CentOS.
```
gcc gcc-c++ ncurses-devel bison glibc-devel cmake libgcc perl make libtool \
gcc gcc-c++ ncurses-devel bison flex glibc-devel cmake libgcc perl make libtool \
openssl-devel libaio libaio-devel librabbitmq-devel libcurl-devel pcre-devel
```
@ -61,7 +63,7 @@ MariaDB-devel MariaDB-server
These packages are required on all versions of Ubuntu and Debian.
```
build-essential libssl-dev libaio-dev ncurses-dev bison \
build-essential libssl-dev libaio-dev ncurses-dev bison flex \
cmake perl libtool librabbitmq-dev libcurl-dev libpcre3-dev
```

View File

@ -281,6 +281,14 @@ Configure the directory for the PID file for MaxScale. This file contains the Pr
piddir=/tmp/maxscale_cache/
```
#### `execdir`
Configure the directory where the executable files reside. All internal processes which are launched will use this directory to look for executable files.
```
execdir=/usr/local/bin/
```
#### `language`
Set the folder where the errmsg.sys file is located in. MaxScale will look for the errmsg.sys file installed with MaxScale from this folder.
@ -774,6 +782,8 @@ and short notations
192.%.%
192.168.%
Note that currently wildcards are only supported in conjunction with IP-addresses, not with domain names.
## Error Reporting
MaxScale is designed to be executed as a service, therefore all error reports, including configuration errors, are written to the MaxScale error log file. By default, MaxScale will log to a file in `/var/log/maxscale`, the only exception to this is if the log directory is not writable, in which case a message is sent to the standard error descriptor.