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

vobase is now acquired through server feature

This commit is contained in:
Kaveh Vahedipour 2016-04-20 15:13:24 +02:00
parent b480155000
commit 72eb968d99
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arangod/Cluster/ServerJob.cpp
View File

@ -28,13 +28,17 @@
#include "Cluster/HeartbeatThread.h"
#include "Dispatcher/DispatcherQueue.h"
#include "Logger/Logger.h"
#include "RestServer/DatabaseFeature.h"
#include "V8/v8-utils.h"
#include "V8Server/V8Context.h"
#include "V8Server/V8DealerFeature.h"
#include "VocBase/server.h"
#include "VocBase/vocbase.h"
#include <iostream>
using namespace arangodb;
using namespace arangodb::application_features;
using namespace arangodb::rest;
static arangodb::Mutex ExecutorLock;
@ -89,10 +93,15 @@ void ServerJob::cleanup(DispatcherQueue* queue) {
bool ServerJob::execute() {
// default to system database
TRI_vocbase_t* const vocbase =
TRI_UseDatabaseServer(_server, TRI_VOC_SYSTEM_DATABASE);
DatabaseFeature* database = dynamic_cast<DatabaseFeature*>(
ApplicationServer::lookupFeature("Database"));
TRI_vocbase_t* const vocbase = database->vocbase();
if (vocbase == nullptr) {
std::cout << "+++++++++++++ oops ++++++++++++++" << std::endl;
// database is gone
return false;
}

4
arangod/Cluster/ServerJob.h
View File

@ -29,7 +29,7 @@
#include "Basics/Exceptions.h"
#include "Basics/Mutex.h"
struct TRI_server_t;
//struct TRI_server_t;
namespace arangodb {
class HeartbeatThread;
@ -86,7 +86,7 @@ class ServerJob : public arangodb::rest::Job {
/// @brief server
//////////////////////////////////////////////////////////////////////////////
TRI_server_t* _server;
// TRI_server_t* _server;
protected:
//////////////////////////////////////////////////////////////////////////////