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 devel

This commit is contained in:
Simon Grätzer 2017-01-18 15:56:12 +01:00
parent e536d21d72 19595ad169
commit 087d4c4151
9 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/apps/system/_admin/aardvark/APP/frontend/build/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
js/apps/system/_admin/aardvark/APP/frontend/build/app.min.js.gz
View File

Binary file not shown.

2
js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html
View File

@ -2742,4 +2742,4 @@ var cutByResolution = function (str) {
</div> </div>
<div id="workMonitorContent" class="innerContent"> <div id="workMonitorContent" class="innerContent">
</div></script></head><body><nav class="navbar" style="display: none"><div class="primary"><div class="navlogo"><a class="logo big" href="#"><img id="ArangoDBLogo" class="arangodbLogo" src="img/arangodb-edition-optimized.svg"></a><a class="logo small" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a><a class="version"><span id="currentVersion"></span></a></div><div class="statmenu" id="statisticBar"></div><div class="navmenu" id="navigationBar"></div></div></nav><div id="modalPlaceholder"></div><div class="bodyWrapper" style="display: none"><div class="centralRow"><div id="navbar2" class="navbarWrapper secondary"><div class="subnavmenu" id="subNavigationBar"></div></div><div class="resizecontainer contentWrapper"><div id="loadingScreen" class="loadingScreen" style="display: none"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw margin-bottom"></i> <span class="sr-only">Loading...</span></div><div id="content" class="centralContent"></div><footer class="footer"><div id="footerBar"></div></footer></div></div></div><div id="progressPlaceholder" style="display:none"></div><div id="spotlightPlaceholder" style="display:none"></div><div id="graphSettingsContent" style="display: none"></div><div id="offlinePlaceholder" style="display:none"><div class="offline-div"><div class="pure-u"><div class="pure-u-1-4"></div><div class="pure-u-1-2 offline-window"><div class="offline-header"><h3>You have been disconnected from the server</h3></div><div class="offline-body"><p>The connection to the server has been lost. The server may be under heavy load.</p><p>Trying to reconnect in <span id="offlineSeconds">10</span> seconds.</p><p class="animation_state"><span><button class="button-success">Reconnect now</button></span></p></div></div><div class="pure-u-1-4"></div></div></div></div><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="libs.js?version=1484678344782"></script><script src="app.js?version=1484678344782"></script></body></html> </div></script></head><body><nav class="navbar" style="display: none"><div class="primary"><div class="navlogo"><a class="logo big" href="#"><img id="ArangoDBLogo" class="arangodbLogo" src="img/arangodb-edition-optimized.svg"></a><a class="logo small" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a><a class="version"><span id="currentVersion"></span></a></div><div class="statmenu" id="statisticBar"></div><div class="navmenu" id="navigationBar"></div></div></nav><div id="modalPlaceholder"></div><div class="bodyWrapper" style="display: none"><div class="centralRow"><div id="navbar2" class="navbarWrapper secondary"><div class="subnavmenu" id="subNavigationBar"></div></div><div class="resizecontainer contentWrapper"><div id="loadingScreen" class="loadingScreen" style="display: none"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw margin-bottom"></i> <span class="sr-only">Loading...</span></div><div id="content" class="centralContent"></div><footer class="footer"><div id="footerBar"></div></footer></div></div></div><div id="progressPlaceholder" style="display:none"></div><div id="spotlightPlaceholder" style="display:none"></div><div id="graphSettingsContent" style="display: none"></div><div id="offlinePlaceholder" style="display:none"><div class="offline-div"><div class="pure-u"><div class="pure-u-1-4"></div><div class="pure-u-1-2 offline-window"><div class="offline-header"><h3>You have been disconnected from the server</h3></div><div class="offline-body"><p>The connection to the server has been lost. The server may be under heavy load.</p><p>Trying to reconnect in <span id="offlineSeconds">10</span> seconds.</p><p class="animation_state"><span><button class="button-success">Reconnect now</button></span></p></div></div><div class="pure-u-1-4"></div></div></div></div><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="libs.js?version=1484747756272"></script><script src="app.js?version=1484747756272"></script></body></html>

BIN
js/apps/system/_admin/aardvark/APP/frontend/build/index-min.html.gz
View File

Binary file not shown.

8
js/apps/system/_admin/aardvark/APP/frontend/js/views/graphViewer.js
View File

@ -277,8 +277,12 @@
killCurrentGraph: function () { killCurrentGraph: function () {
for (var i in this.currentGraph.renderers) { for (var i in this.currentGraph.renderers) {
this.currentGraph.renderers[i].clear(); try {
this.currentGraph.kill(i); this.currentGraph.renderers[i].clear();
this.currentGraph.kill(i);
} catch (ignore) {
// no need to cleanup
}
} }
}, },

20
js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
View File

@ -697,17 +697,22 @@
this.initDone = true; this.initDone = true;
this.renderBindParamTable(true); this.renderBindParamTable(true);
this.restoreCachedQueries(); this.restoreCachedQueries();
this.delegateEvents();
}, },
cleanupGraphs: function () { cleanupGraphs: function () {
_.each(this.graphViewers, function (graphView) { if (this.graphViewers !== undefined || this.graphViewers !== null) {
graphView.killCurrentGraph(); _.each(this.graphViewers, function (graphView) {
graphView.remove(); if (graphView !== undefined) {
}); graphView.killCurrentGraph();
$('canvas').remove(); graphView.remove();
}
});
$('canvas').remove();
this.graphViewers = null; this.graphViewers = null;
this.graphViewers = []; this.graphViewers = [];
}
}, },
afterRender: function () { afterRender: function () {
@ -739,6 +744,7 @@
self.bindQueryResultButtons(null, counter); self.bindQueryResultButtons(null, counter);
} }
}); });
$('#removeResults').show();
} }
}, },

2
lib/ApplicationFeatures/ConfigFeature.cpp
View File

@ -62,7 +62,7 @@ void ConfigFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
new VectorParameter<StringParameter>(&_defines)); new VectorParameter<StringParameter>(&_defines));
options->addOption("--check-configuration", options->addOption("--check-configuration",
"check the configuration and exists", "check the configuration and exit",
new BooleanParameter(&_checkConfiguration)); new BooleanParameter(&_checkConfiguration));
} }

2
lib/Logger/LogAppender.cpp
View File

@ -70,7 +70,7 @@ void LogAppender::addTtyAppender() { _ttyAppender.reset(new LogAppenderTty()); }
std::pair<std::shared_ptr<LogAppender>, LogTopic*> LogAppender::buildAppender( std::pair<std::shared_ptr<LogAppender>, LogTopic*> LogAppender::buildAppender(
std::string const& definition, std::string const& filter) { std::string const& definition, std::string const& filter) {
std::vector<std::string> v = StringUtils::split(definition, '='); std::vector<std::string> v = StringUtils::split(definition, '=', '\0');
std::string topicName; std::string topicName;
std::string output; std::string output;
std::string contentFilter; std::string contentFilter;

4
lib/Logger/LogAppenderFile.cpp
View File

@ -117,7 +117,9 @@ LogAppenderFile::LogAppenderFile(std::string const& filename,
S_IRUSR | S_IWUSR | S_IRGRP); S_IRUSR | S_IWUSR | S_IRGRP);
if (fd < 0) { if (fd < 0) {
std::cerr << "cannot write to file '" << filename << "'" << std::endl; TRI_ERRORBUF;
TRI_SYSTEM_ERROR();
std::cerr << "cannot write to file '" << filename << "': " << TRI_GET_ERRORBUF << std::endl;
THROW_ARANGO_EXCEPTION(TRI_ERROR_CANNOT_WRITE_FILE); THROW_ARANGO_EXCEPTION(TRI_ERROR_CANNOT_WRITE_FILE);
} }