Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types

This commit is contained in:
jsteemann 2016-09-07 18:04:57 +02:00
parent 07dc85ad22 4cb7a787b1
commit a495dc9835
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -25,6 +25,7 @@ core.*
*.lnk *.lnk
Thumbs.db Thumbs.db
enterprise
compile_commands.json compile_commands.json
instanceinfo.json instanceinfo.json
testresult.json testresult.json

9
CMakeLists.txt
View File

@ -49,6 +49,15 @@ if (USE_DEV_TIMERS)
add_definitions("-DUSE_DEV_TIMERS=1") add_definitions("-DUSE_DEV_TIMERS=1")
endif () endif ()
# enable enterprise features
set(ENTERPRISE_INCLUDE_DIR "enterprise")
option(USE_ENTERPRISE OFF)
if (USE_ENTERPRISE)
add_definitions("-DUSE_ENTERPRISE=1")
include_directories(${ENTERPRISE_INCLUDE_DIR})
endif ()
################################################################################ ################################################################################
## ARANGODB ## ARANGODB
################################################################################ ################################################################################

12
arangod/RestServer/BootstrapFeature.cpp
View File

@ -35,6 +35,10 @@
#include "RestServer/DatabaseFeature.h" #include "RestServer/DatabaseFeature.h"
#include "V8Server/V8DealerFeature.h" #include "V8Server/V8DealerFeature.h"
#ifdef USE_ENTERPRISE
#include "Enterprise/Version.h"
#endif
using namespace arangodb; using namespace arangodb;
using namespace arangodb::application_features; using namespace arangodb::application_features;
using namespace arangodb::options; using namespace arangodb::options;
@ -155,11 +159,17 @@ void BootstrapFeature::start() {
// Start service properly: // Start service properly:
rest::RestHandlerFactory::setMaintenance(false); rest::RestHandlerFactory::setMaintenance(false);
#ifdef USE_ENTERPRISE
LOG(INFO) << "ArangoDB (enterprise version " << ARANGODB_VERSION_FULL
<< " / " << ENTERPRISE_VERSION << ") is ready for business. Have fun!";
#else
LOG(INFO) << "ArangoDB (version " << ARANGODB_VERSION_FULL LOG(INFO) << "ArangoDB (version " << ARANGODB_VERSION_FULL
<< ") is ready for business. Have fun!"; << ") is ready for business. Have fun!";
#endif
if (_bark) { if (_bark) {
LOG(INFO) << "der Hund so: wau wau!"; LOG(INFO) << "The dog says: wau wau!";
} }
_isReady = true; _isReady = true;

15
lib/Rest/Version.cpp
View File

@ -44,6 +44,10 @@
#include <rocksdb/version.h> #include <rocksdb/version.h>
#endif #endif
#ifdef USE_ENTERPRISE
#include "Enterprise/Version.h"
#endif
using namespace arangodb::rest; using namespace arangodb::rest;
std::map<std::string, std::string> Version::Values; std::map<std::string, std::string> Version::Values;
@ -96,9 +100,6 @@ void Version::initialize() {
Values["asm-crc32"] = (ENABLE_ASM_CRC32) ? "true" : "false"; Values["asm-crc32"] = (ENABLE_ASM_CRC32) ? "true" : "false";
Values["boost-version"] = getBoostVersion(); Values["boost-version"] = getBoostVersion();
Values["build-date"] = getBuildDate(); Values["build-date"] = getBuildDate();
#if HAVE_ARANGODB_BUILD_REPOSITORY
Values["build-repository"] = getBuildRepository();
#endif
Values["compiler"] = getCompiler(); Values["compiler"] = getCompiler();
Values["endianness"] = getEndianness(); Values["endianness"] = getEndianness();
Values["fd-setsize"] = arangodb::basics::StringUtils::itoa(FD_SETSIZE); Values["fd-setsize"] = arangodb::basics::StringUtils::itoa(FD_SETSIZE);
@ -113,6 +114,14 @@ void Version::initialize() {
Values["zlib-version"] = getZLibVersion(); Values["zlib-version"] = getZLibVersion();
#if USE_ENTERPRISE
Values["enterprise-version"] = ENTERPRISE_VERSION;
#endif
#if HAVE_ARANGODB_BUILD_REPOSITORY
Values["build-repository"] = getBuildRepository();
#endif
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
Values["assertions"] = "true"; Values["assertions"] = "true";
#else #else