mirror of https://gitee.com/bigwinds/arangodb
Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
This commit is contained in:
a-brandt
commit
aa4805ecc5
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
BUILT_SOURCES += @ICU_BUILT@
|
||||
ICUDIR = @abs_top_srcdir@/3rdParty/icu/BUILD
|
||||
CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR)
|
||||
|
||||
@ICU_LIBS@: @srcdir@/.icu-build-@TRI_BITS@
|
||||
|
||||
|
|
@ -47,7 +46,7 @@ CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR)
|
|||
### @brief additional files to remove
|
||||
################################################################################
|
||||
|
||||
CLEANUP += .icu-build-@TRI_BITS@
|
||||
CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR)
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
################################################################################
|
||||
|
||||
BUILT_SOURCES += @LIBEV_LIBS@
|
||||
CLEANUP += @srcdir@/.libev-build-@TRI_BITS@ @top_srcdir@/3rdParty/libev/BUILD
|
||||
|
||||
@LIBEV_LIBS@: @srcdir@/.libev-build-@TRI_BITS@
|
||||
|
||||
|
|
@ -36,7 +35,7 @@ CLEANUP += @srcdir@/.libev-build-@TRI_BITS@ @top_srcdir@/3rdParty/libev/BUILD
|
|||
### @brief additional files to remove
|
||||
################################################################################
|
||||
|
||||
CLEANUP += .libev-build-@TRI_BITS@
|
||||
CLEANUP += @srcdir@/.libev-build-@TRI_BITS@ @top_srcdir@/3rdParty/libev/BUILD
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
################################################################################
|
||||
|
||||
BUILT_SOURCES += @MRUBY_LIBS@
|
||||
CLEANUP += @srcdir@/.mruby-build-@TRI_BITS@
|
||||
|
||||
@MRUBY_LIBS@: @srcdir@/.mruby-build-@TRI_BITS@
|
||||
|
||||
|
|
@ -32,9 +31,15 @@ CLEANUP += @srcdir@/.mruby-build-@TRI_BITS@
|
|||
|
||||
################################################################################
|
||||
### @brief additional files to remove
|
||||
###
|
||||
### "clean" in mruby is broken
|
||||
################################################################################
|
||||
|
||||
CLEANUP += .mruby-build-@TRI_BITS@
|
||||
CLEANUP += @srcdir@/.mruby-build-@TRI_BITS@
|
||||
CLEANUP_3RD += clean-mruby
|
||||
|
||||
clean-mruby:
|
||||
cd @top_srcdir@/3rdParty/MRUBY && ( $(MAKE) -k clean || true )
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
################################################################################
|
||||
|
||||
BUILT_SOURCES += @V8_LIBS@
|
||||
CLEANUP += @srcdir@/.v8-build-@TRI_BITS@
|
||||
|
||||
@V8_LIBS@: @srcdir@/.v8-build-@TRI_BITS@
|
||||
|
||||
|
|
@ -34,7 +33,15 @@ CLEANUP += @srcdir@/.v8-build-@TRI_BITS@
|
|||
### @brief additional files to remove
|
||||
################################################################################
|
||||
|
||||
CLEANUP += .v8-build-@TRI_BITS@
|
||||
CLEANUP += @srcdir@/.v8-build-@TRI_BITS@
|
||||
CLEANUP_3RD += clean-v8
|
||||
|
||||
clean-v8:
|
||||
cd @top_srcdir@/3rdParty/V8 && ( $(MAKE) clean || true )
|
||||
rm -rf @top_srcdir@/3rdParty/V8/out
|
||||
rm -rf @top_srcdir@/3rdParty/V8/tools/*.pyc
|
||||
rm -rf @top_srcdir@/3rdParty/V8/build/gyp/pylib/gyp/*.pyc
|
||||
rm -rf @top_srcdir@/3rdParty/V8/build/gyp/pylib/gyp/*/*.pyc
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,7 @@
|
|||
v1.1.beta3 (XXXX-XX-XX)
|
||||
-----------------------
|
||||
v1.1.0 (XXXX-XX-XX)
|
||||
-------------------
|
||||
|
||||
# fixed issue #269: fix make distclean & clean
|
||||
|
||||
* fixed issue #296: system collections not usable from AQL
|
||||
|
||||
|
|
|
|||
|
|
@ -250,12 +250,7 @@ endif
|
|||
################################################################################
|
||||
|
||||
CLEANUP += \
|
||||
$(DOXYGEN) \
|
||||
Doxygen/doc \
|
||||
Doxygen/latex \
|
||||
Doxygen/website \
|
||||
Doxygen/wiki \
|
||||
Doxygen/xml
|
||||
Doxygen/*
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
|
|
|
|||
|
|
@ -103,16 +103,6 @@ removed. Replacing will also create a new revision:
|
|||
|
||||
For more information, please check @ref RestDocument.
|
||||
|
||||
Blueprints API {#NewFeatures11BluePrintsAPI}
|
||||
--------------------------------------------
|
||||
|
||||
Blueprints is a property graph model interface with provided
|
||||
implementations. Databases that implement the Blueprints interfaces
|
||||
automatically support Blueprints-enabled applications
|
||||
(@EXTREF{http://tinkerpop.com/,http://tinkerpop.com}).
|
||||
|
||||
For more information please refer to @ref HttpBlueprints.
|
||||
|
||||
AQL Improvements {#NewFeatures11AqlImprovements}
|
||||
------------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ TOC {#NewFeatures11TOC}
|
|||
- @ref NewFeatures11CollectionTypes
|
||||
- @ref NewFeatures11BatchRequests
|
||||
- @ref NewFeatures11PartialUpdates
|
||||
- @ref NewFeatures11BluePrintsAPI
|
||||
- @ref NewFeatures11AqlImprovements
|
||||
- @ref NewFeatures11DiskSynchronisation
|
||||
- @ref NewFeatures11ServerStatistics
|
||||
|
|
|
|||
|
|
@ -137,7 +137,6 @@ following command line option:
|
|||
|
||||
Of course this option can also be stored in a configuration file.
|
||||
|
||||
|
||||
### HTTP keep-alive
|
||||
|
||||
The following _arangod_ startup options have been removed in ArangoDB
|
||||
|
|
@ -261,6 +260,15 @@ interactively prompt for a password. If no username is specified on
|
|||
the command line, the default user _root_ will be used but there will
|
||||
still be a password prompt.
|
||||
|
||||
Change of syslog usage
|
||||
----------------------
|
||||
|
||||
In 1.0, arangod always logged its output to the syslog, regardless of
|
||||
any other logging that was configured. In 1.1, this has changed. Log
|
||||
messages will be sent to the syslog only if the server is started with
|
||||
the `--log.syslog` option and a non-empty string (the log facility)
|
||||
is given to it.
|
||||
|
||||
Removed functionality
|
||||
---------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,12 @@ dist_man_MANS =
|
|||
|
||||
CLEANUP =
|
||||
|
||||
################################################################################
|
||||
### @brief tragets for cleanup of 3rd party libraries
|
||||
################################################################################
|
||||
|
||||
CLEANUP_3RD =
|
||||
|
||||
################################################################################
|
||||
### @brief flex files
|
||||
################################################################################
|
||||
|
|
@ -303,6 +309,9 @@ endif
|
|||
## cleanup
|
||||
################################################################################
|
||||
|
||||
distclean-local:
|
||||
@for i in $(CLEANUP_3RD); do $(MAKE) $$i; done
|
||||
|
||||
clean-local:
|
||||
rm -rf $(CLEANUP)
|
||||
rm -f $(BUILT_SOURCES)
|
||||
|
|
|
|||
88
Makefile.in
88
Makefile.in
|
|
@ -278,32 +278,29 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
|
|||
################################################################################
|
||||
### @brief additional files to remove
|
||||
################################################################################
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@am__append_21 = @srcdir@/.libev-build-@TRI_BITS@ \
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @top_srcdir@/3rdParty/libev/BUILD \
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ .libev-build-@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@am__append_21 = @srcdir@/.libev-build-@TRI_BITS@ @top_srcdir@/3rdParty/libev/BUILD
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@am__append_22 = @V8_LIBS@
|
||||
|
||||
################################################################################
|
||||
### @brief additional files to remove
|
||||
################################################################################
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@am__append_23 = \
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ @srcdir@/.v8-build-@TRI_BITS@ \
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ .v8-build-@TRI_BITS@
|
||||
@ENABLE_MRUBY_TRUE@am__append_24 = @MRUBY_LIBS@
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@am__append_23 = @srcdir@/.v8-build-@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@am__append_24 = clean-v8
|
||||
@ENABLE_MRUBY_TRUE@am__append_25 = @MRUBY_LIBS@
|
||||
|
||||
################################################################################
|
||||
### @brief additional files to remove
|
||||
###
|
||||
### "clean" in mruby is broken
|
||||
################################################################################
|
||||
@ENABLE_MRUBY_TRUE@am__append_26 = @srcdir@/.mruby-build-@TRI_BITS@
|
||||
@ENABLE_MRUBY_TRUE@am__append_27 = clean-mruby
|
||||
@ENABLE_ALL_IN_ONE_ICU_TRUE@am__append_28 = @ICU_BUILT@
|
||||
|
||||
################################################################################
|
||||
### @brief additional files to remove
|
||||
################################################################################
|
||||
@ENABLE_MRUBY_TRUE@am__append_25 = @srcdir@/.mruby-build-@TRI_BITS@ \
|
||||
@ENABLE_MRUBY_TRUE@ .mruby-build-@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_ICU_TRUE@am__append_26 = @ICU_BUILT@
|
||||
|
||||
################################################################################
|
||||
### @brief additional files to remove
|
||||
################################################################################
|
||||
@ENABLE_ALL_IN_ONE_ICU_TRUE@am__append_27 = \
|
||||
@ENABLE_ALL_IN_ONE_ICU_TRUE@ @srcdir@/.icu-build-@TRI_BITS@ \
|
||||
@ENABLE_ALL_IN_ONE_ICU_TRUE@ $(ICUDIR) .icu-build-@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_ICU_TRUE@am__append_29 = @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR)
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
|
||||
|
|
@ -994,7 +991,7 @@ BUILT_SOURCES = build.h $(JAVASCRIPT_HEADER) $(JAVASCRIPT_BROWSER) \
|
|||
$(am__append_14) Doxygen/.setup-directories \
|
||||
@builddir@/.setup-js-directories $(am__append_16) \
|
||||
$(am__append_18) $(am__append_19) $(am__append_20) \
|
||||
$(am__append_22) $(am__append_24) $(am__append_26)
|
||||
$(am__append_22) $(am__append_25) $(am__append_28)
|
||||
|
||||
################################################################################
|
||||
### @brief man pages to install
|
||||
|
|
@ -1022,10 +1019,14 @@ dist_man_MANS = Documentation/man/man1/arangoimp.1 \
|
|||
################################################################################
|
||||
### @brief cleanup
|
||||
################################################################################
|
||||
CLEANUP = $(am__append_12) $(bin_SCRIPTS) $(DOXYGEN) Doxygen/doc \
|
||||
Doxygen/latex Doxygen/website Doxygen/wiki Doxygen/xml \
|
||||
CLEANUP = $(am__append_12) $(bin_SCRIPTS) Doxygen/* \
|
||||
$(JAVASCRIPT_HEADER) $(am__append_17) $(am__append_21) \
|
||||
$(am__append_23) $(am__append_25) $(am__append_27)
|
||||
$(am__append_23) $(am__append_26) $(am__append_29)
|
||||
|
||||
################################################################################
|
||||
### @brief tragets for cleanup of 3rd party libraries
|
||||
################################################################################
|
||||
CLEANUP_3RD = $(am__append_24) $(am__append_27)
|
||||
|
||||
################################################################################
|
||||
### @brief flex files
|
||||
|
|
@ -4870,7 +4871,7 @@ distclean: distclean-am
|
|||
-rm -rf UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/ArangoShell/$(DEPDIR) arangosh/Benchmark/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR)
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
distclean-hdr distclean-tags
|
||||
distclean-hdr distclean-local distclean-tags
|
||||
|
||||
dvi: dvi-am
|
||||
|
||||
|
|
@ -4947,21 +4948,21 @@ uninstall-man: uninstall-man1 uninstall-man8
|
|||
cscope cscopelist ctags dist dist-all dist-bzip2 dist-gzip \
|
||||
dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
|
||||
distclean distclean-compile distclean-generic distclean-hdr \
|
||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-arangosysconfDATA install-binPROGRAMS \
|
||||
install-binSCRIPTS install-data install-data-am \
|
||||
install-data-local install-dvi install-dvi-am install-exec \
|
||||
install-exec-am install-html install-html-am install-info \
|
||||
install-info-am install-man install-man1 install-man8 \
|
||||
install-nobase_pkgdataDATA install-pdf install-pdf-am \
|
||||
install-ps install-ps-am install-sbinPROGRAMS install-strip \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
||||
uninstall-am uninstall-arangosysconfDATA uninstall-binPROGRAMS \
|
||||
uninstall-binSCRIPTS uninstall-man uninstall-man1 \
|
||||
uninstall-man8 uninstall-nobase_pkgdataDATA \
|
||||
distclean-local distclean-tags distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||
install install-am install-arangosysconfDATA \
|
||||
install-binPROGRAMS install-binSCRIPTS install-data \
|
||||
install-data-am install-data-local install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-man install-man1 \
|
||||
install-man8 install-nobase_pkgdataDATA install-pdf \
|
||||
install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
|
||||
tags uninstall uninstall-am uninstall-arangosysconfDATA \
|
||||
uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man \
|
||||
uninstall-man1 uninstall-man8 uninstall-nobase_pkgdataDATA \
|
||||
uninstall-sbinPROGRAMS
|
||||
|
||||
|
||||
|
|
@ -5343,6 +5344,9 @@ unittests-bitarray-index:
|
|||
################################################################################
|
||||
################################################################################
|
||||
|
||||
distclean-local:
|
||||
@for i in $(CLEANUP_3RD); do $(MAKE) $$i; done
|
||||
|
||||
clean-local:
|
||||
rm -rf $(CLEANUP)
|
||||
rm -f $(BUILT_SOURCES)
|
||||
|
|
@ -5594,6 +5598,13 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo
|
||||
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@clean-v8:
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ cd @top_srcdir@/3rdParty/V8 && ( $(MAKE) clean || true )
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ rm -rf @top_srcdir@/3rdParty/V8/out
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ rm -rf @top_srcdir@/3rdParty/V8/tools/*.pyc
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ rm -rf @top_srcdir@/3rdParty/V8/build/gyp/pylib/gyp/*.pyc
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ rm -rf @top_srcdir@/3rdParty/V8/build/gyp/pylib/gyp/*/*.pyc
|
||||
|
||||
@ENABLE_MRUBY_TRUE@@MRUBY_LIBS@: @srcdir@/.mruby-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_MRUBY_TRUE@@srcdir@/.mruby-build-@TRI_BITS@:
|
||||
|
|
@ -5613,6 +5624,9 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_MRUBY_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_MRUBY_TRUE@ @echo
|
||||
|
||||
@ENABLE_MRUBY_TRUE@clean-mruby:
|
||||
@ENABLE_MRUBY_TRUE@ cd @top_srcdir@/3rdParty/MRUBY && ( $(MAKE) -k clean || true )
|
||||
|
||||
@ENABLE_ALL_IN_ONE_ICU_TRUE@@ICU_LIBS@: @srcdir@/.icu-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_ALL_IN_ONE_ICU_TRUE@@srcdir@/.icu-build-@TRI_BITS@:
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ void ApplicationServer::setupLogging () {
|
|||
TRI_SetFileToLog(i->c_str());
|
||||
}
|
||||
|
||||
if (NULL == TRI_CreateLogAppenderFile(_logFile)) {
|
||||
if (NULL == TRI_CreateLogAppenderFile(_logFile.c_str())) {
|
||||
if (_logFile.length() > 0) {
|
||||
// the user specified a log file to use but it could not be created. bail out
|
||||
std::cerr << "failed to create logfile " << _logFile << std::endl;
|
||||
|
|
@ -250,7 +250,9 @@ void ApplicationServer::setupLogging () {
|
|||
}
|
||||
}
|
||||
#ifdef TRI_ENABLE_SYSLOG
|
||||
TRI_CreateLogAppenderSyslog(_logPrefix, _logSyslog);
|
||||
if (_logSyslog != "") {
|
||||
TRI_CreateLogAppenderSyslog(_logPrefix.c_str(), _logSyslog.c_str());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1432,6 +1432,7 @@ TRI_log_appender_t* TRI_CreateLogAppenderFile (char const* filename) {
|
|||
|
||||
typedef struct log_appender_syslog_s {
|
||||
TRI_log_appender_t base;
|
||||
TRI_mutex_t _mutex;
|
||||
}
|
||||
log_appender_syslog_t;
|
||||
|
||||
|
|
@ -1462,6 +1463,7 @@ static void LogAppenderSyslog_Log (TRI_log_appender_t* appender,
|
|||
char const* msg,
|
||||
size_t length) {
|
||||
int priority;
|
||||
log_appender_syslog_t* self;
|
||||
|
||||
switch (severity) {
|
||||
case TRI_LOG_SEVERITY_EXCEPTION: priority = LOG_CRIT; break;
|
||||
|
|
@ -1481,8 +1483,12 @@ static void LogAppenderSyslog_Log (TRI_log_appender_t* appender,
|
|||
case TRI_LOG_LEVEL_TRACE: priority = LOG_DEBUG; break;
|
||||
}
|
||||
}
|
||||
|
||||
self = (log_appender_syslog_t*) appender;
|
||||
|
||||
TRI_LockMutex(&self->_mutex);
|
||||
syslog(priority, "%s", msg);
|
||||
TRI_UnlockMutex(&self->_mutex);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -1518,9 +1524,14 @@ static void LogAppenderSyslog_Close (TRI_log_appender_t* appender) {
|
|||
}
|
||||
|
||||
TRI_UnlockSpin(&AppendersLock);
|
||||
|
||||
|
||||
self = (log_appender_syslog_t*) appender;
|
||||
TRI_LockMutex(&self->_mutex);
|
||||
closelog();
|
||||
TRI_UnlockMutex(&self->_mutex);
|
||||
|
||||
TRI_DestroyMutex(&self->_mutex);
|
||||
|
||||
TRI_Free(TRI_CORE_MEM_ZONE, self);
|
||||
}
|
||||
|
||||
|
|
@ -1549,9 +1560,12 @@ TRI_log_appender_t* TRI_CreateLogAppenderSyslog (char const* name, char const* f
|
|||
log_appender_syslog_t* appender;
|
||||
int value;
|
||||
|
||||
assert(facility);
|
||||
assert(*facility != '\0');
|
||||
|
||||
// no logging
|
||||
if (name == NULL || *name == '\0') {
|
||||
name = "[voc]";
|
||||
name = "[arangod]";
|
||||
}
|
||||
|
||||
// allocate space
|
||||
|
|
@ -1562,6 +1576,8 @@ TRI_log_appender_t* TRI_CreateLogAppenderSyslog (char const* name, char const* f
|
|||
appender->base.reopen = LogAppenderSyslog_Reopen;
|
||||
appender->base.close = LogAppenderSyslog_Close;
|
||||
|
||||
TRI_InitMutex(&appender->_mutex);
|
||||
|
||||
// find facility
|
||||
value = LOG_LOCAL0;
|
||||
|
||||
|
|
@ -1582,7 +1598,9 @@ TRI_log_appender_t* TRI_CreateLogAppenderSyslog (char const* name, char const* f
|
|||
}
|
||||
|
||||
// and open logging
|
||||
TRI_LockMutex(&appender->_mutex);
|
||||
openlog(name, LOG_CONS | LOG_PID, value);
|
||||
TRI_UnlockMutex(&appender->_mutex);
|
||||
|
||||
// and store it
|
||||
TRI_LockSpin(&AppendersLock);
|
||||
|
|
|
|||
|
|
@ -85,26 +85,6 @@ void TRI_SetFileToLog (string const& file) {
|
|||
TRI_SetFileToLog(file.c_str());
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief creates a log appender for file output
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
TRI_log_appender_t* TRI_CreateLogAppenderFile (string const& filename) {
|
||||
return TRI_CreateLogAppenderFile(filename.c_str());
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief creates a syslog appender
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef TRI_ENABLE_SYSLOG
|
||||
|
||||
TRI_log_appender_t* TRI_CreateLogAppenderSyslog (string const& name, string const& facility) {
|
||||
return TRI_CreateLogAppenderSyslog(name.c_str(), facility.c_str());
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @}
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -782,22 +782,6 @@ void TRI_SetPrefixLogging (std::string const& prefix);
|
|||
|
||||
void TRI_SetFileToLog (std::string const& file);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief creates a log appender for file output
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
TRI_log_appender_t* TRI_CreateLogAppenderFile (std::string const& filename);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief creates a syslog appender
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef TRI_ENABLE_SYSLOG
|
||||
|
||||
TRI_log_appender_t* TRI_CreateLogAppenderSyslog (std::string const& name, std::string const& facility);
|
||||
|
||||
#endif
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @}
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
Loading…
Reference in New Issue