mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
This commit is contained in:
commit
bc966c1848
|
@ -48,3 +48,11 @@ before_script: "bash -c Installation/travisCI/before_script.sh"
|
||||||
script:
|
script:
|
||||||
- "bash -c Installation/travisCI/build.sh"
|
- "bash -c Installation/travisCI/build.sh"
|
||||||
after_failure: "bash -c Installation/travisCI/after_failure.sh"
|
after_failure: "bash -c Installation/travisCI/after_failure.sh"
|
||||||
|
|
||||||
|
notifications:
|
||||||
|
webhooks:
|
||||||
|
urls:
|
||||||
|
- https://webhooks.gitter.im/e/806d92fa9ae97d241599
|
||||||
|
on_success: change
|
||||||
|
on_failure: always
|
||||||
|
on_start: false
|
|
@ -108,7 +108,7 @@
|
||||||
* [Debugging](Foxx/Develop/Debugging.md)
|
* [Debugging](Foxx/Develop/Debugging.md)
|
||||||
* [Source Files](Foxx/Develop/Folder.md)
|
* [Source Files](Foxx/Develop/Folder.md)
|
||||||
* [Controller](Foxx/Develop/Controller.md)
|
* [Controller](Foxx/Develop/Controller.md)
|
||||||
* [Setup & Teardown](Foxx/Develop/Scripts.md)
|
* [Scripts](Foxx/Develop/Scripts.md)
|
||||||
* [Repository](Foxx/Develop/Repository.md)
|
* [Repository](Foxx/Develop/Repository.md)
|
||||||
* [Model](Foxx/Develop/Model.md)
|
* [Model](Foxx/Develop/Model.md)
|
||||||
* [Queries](Foxx/Develop/Queries.md)
|
* [Queries](Foxx/Develop/Queries.md)
|
||||||
|
|
|
@ -135,7 +135,6 @@ exports.manage = function () {
|
||||||
exports.run = function () {
|
exports.run = function () {
|
||||||
var options = require('internal').options();
|
var options = require('internal').options();
|
||||||
|
|
||||||
|
|
||||||
// disable foxx queues
|
// disable foxx queues
|
||||||
if (options['server.foxx-queues'] === false) {
|
if (options['server.foxx-queues'] === false) {
|
||||||
return;
|
return;
|
||||||
|
@ -164,7 +163,7 @@ exports.run = function () {
|
||||||
db._useDatabase(initialDatabase);
|
db._useDatabase(initialDatabase);
|
||||||
|
|
||||||
return tasks.register({
|
return tasks.register({
|
||||||
command: function (params) {
|
command: function () {
|
||||||
require('org/arangodb/foxx/queues/manager').manage();
|
require('org/arangodb/foxx/queues/manager').manage();
|
||||||
},
|
},
|
||||||
period: period,
|
period: period,
|
||||||
|
|
Loading…
Reference in New Issue