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

Merge branch 'vpack' of github.com:arangodb/arangodb into vpack

This commit is contained in:
Michael Hackstein 2016-01-15 10:57:23 +01:00
parent 84ad532078 f1b0114e89
commit f1ee6cb4e1
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arangod/VocBase/server.cpp
View File

@ -175,12 +175,6 @@ static int ReadServerId(char const* filename) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static int WriteServerId(char const* filename) { static int WriteServerId(char const* filename) {
char* idString;
char buffer[32];
size_t len;
time_t tt;
struct tm tb;
TRI_ASSERT(filename != nullptr); TRI_ASSERT(filename != nullptr);
// create a VelocyPackObject // create a VelocyPackObject
VPackBuilder builder; VPackBuilder builder;
@ -188,13 +182,14 @@ static int WriteServerId(char const* filename) {
builder.openObject(); builder.openObject();
TRI_ASSERT(ServerId != 0); TRI_ASSERT(ServerId != 0);
idString = TRI_StringUInt64((uint64_t)ServerId); builder.add("serverId", VPackValue(std::to_string(ServerId)));
builder.add("serverId", VPackValue(idString));
tt = time(0); time_t tt = time(0);
struct tm tb;
TRI_gmtime(tt, &tb); TRI_gmtime(tt, &tb);
len = strftime(buffer, sizeof(buffer), "%Y-%m-%dT%H:%M:%SZ", &tb); char buffer[32];
builder.add("createdTime", VPackValue(buffer)); size_t len = strftime(buffer, sizeof(buffer), "%Y-%m-%dT%H:%M:%SZ", &tb);
builder.add("createdTime", VPackValue(std::string(buffer, len)));
builder.close(); builder.close();
} catch (...) { } catch (...) {