diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-08-11 17:07:41 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-10-28 05:42:04 +0100 |
| commit | 1d1cd04cb9b8e66e0303c362669db2c6c47fccae (patch) | |
| tree | 09244a813bbdbb0a0ad20a44c42cd5c8fe699860 /ctdb/tests/eventscripts/scripts | |
| parent | 29745543566ef66c1f2972fd5cd68e17ddf4de4f (diff) | |
| download | samba-1d1cd04cb9b8e66e0303c362669db2c6c47fccae.tar.gz samba-1d1cd04cb9b8e66e0303c362669db2c6c47fccae.tar.xz samba-1d1cd04cb9b8e66e0303c362669db2c6c47fccae.zip | |
ctdb-logging: New option CTDB_LOGGING, remove CTDB_LOGFILE, CTDB_SYSLOG
Remove --logfile and --syslog daemon options and replace with
--logging.
Modularise and clean up logging initialisation code. The
initialisation API includes an app_name argument that is currently
unused - this will be used in extensions to the syslog backend.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tests/eventscripts/scripts')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index 8f31154c02..d14e42ec84 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -23,8 +23,9 @@ fi mkdir -p "$EVENTSCRIPTS_TESTS_VAR_DIR" export CTDB_VARDIR="$EVENTSCRIPTS_TESTS_VAR_DIR/ctdb" -export CTDB_LOGFILE="${EVENTSCRIPTS_TESTS_VAR_DIR}/log.ctdb" -touch "$CTDB_LOGFILE" || die "Unable to create CTDB_LOGFILE=$CTDB_LOGFILE" +export CTDB_LOGGING="file:${EVENTSCRIPTS_TESTS_VAR_DIR}/log.ctdb" +touch "${CTDB_LOGGING#file:}" || \ + die "Unable to setup logging for \"$CTDB_LOGGING\"" if [ -d "${TEST_SUBDIR}/etc" ] ; then cp -a "${TEST_SUBDIR}/etc" "$EVENTSCRIPTS_TESTS_VAR_DIR" |