1
0
Fork 0
Commit Graph

500 Commits

Author SHA1 Message Date
jsteemann 4f72db6451 speed up calls to user-defined functions 2016-05-13 23:08:39 +02:00
hkernbach 628474f54e sessions value generation 2016-05-13 17:48:44 +02:00
jsteemann d4cb93fb9c added TYPENAME() and HASH() functions 2016-05-11 23:54:00 +02:00
Andreas Streichardt 5d3abc879e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-11 15:31:11 +02:00
Andreas Streichardt 4d13e8fb1b _listDatabases() => _databases() 2016-05-11 15:30:47 +02:00
Max Neunhoeffer 4ca4832321 Repair aardvark routes for cluster frontend.
This gets rid of agency-communication.js for good.
This removes the last instance of ArangoAgency.list calls.
2016-05-11 14:15:57 +02:00
Jan Steemann d2a1c9cf4a jslint 2016-05-10 20:16:10 +02:00
Andreas Streichardt 5ee179d7ae fix agency communication 2016-05-10 19:52:04 +02:00
Andreas Streichardt 2c7b7450e1 handlePlanChange() will now use the cache 2016-05-10 18:42:30 +02:00
Alan Plum 1c87085f73
ES6 > lodash 2016-05-09 18:20:06 +02:00
Alan Plum e05c9440b9
Use manifest instead of service in service.toJSON 2016-05-09 18:18:37 +02:00
Alan Plum 3deb641d00
Make sure headers exists before adding headers 2016-05-09 18:12:34 +02:00
Alan Plum 6459b39159
Fix missing name/version in generated foxxes 2016-05-09 18:12:33 +02:00
jsteemann e1f874ad4a jslint 2016-05-07 07:56:16 +02:00
Andreas Streichardt 9cbf7aae33 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-06 19:12:30 +02:00
Jan Steemann b2171e425d removed unused functions 2016-05-06 17:59:06 +02:00
Andreas Streichardt 3773b0e66c Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-06 17:04:04 +02:00
Andreas Streichardt 04ba5156e5 Rework planned collection loading 2016-05-06 17:03:13 +02:00
Kaveh Vahedipour e623198d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 17:06:23 +02:00
Michael Hackstein 04753a9131 Improved type checking of options in a graph function. 2016-05-04 15:54:16 +02:00
Max Neunhoeffer f0db06b47d Fix test and jslint. 2016-05-04 14:50:37 +02:00
Kaveh Vahedipour 5d911bceb4 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 15:48:36 +02:00
Alan Plum c1828234d6
Move shallowCopy and propertyKeys into @arangodb/util 2016-05-03 14:55:32 +02:00
Alan Plum eef85f6202
Sort Foxx manifest fields 2016-05-03 14:08:19 +02:00
Alan Plum 4d6e0d5d3b
Generate README for new Foxx services 2016-05-03 11:33:23 +02:00
Kaveh Vahedipour dab8accd5b Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 08:57:09 +02:00
jsteemann 065d1bfa9a don't fail 2016-05-03 00:44:55 +02:00
jsteemann 64f55422ce jslint 2016-05-02 19:53:16 +02:00
Alan Plum 82a43bfca7
service.name -> service.manifest.name etc 2016-05-02 18:56:04 +02:00
Alan Plum 3bb355e3dc
Don't default to index.js 2016-05-02 18:47:37 +02:00
Andreas Streichardt b2190aacb1 Announce new, boostraped dbs correctly in agency 2016-05-02 18:40:46 +02:00
Kaveh Vahedipour de4d6efec9 corrected changes for new json structure 2016-05-02 18:19:21 +02:00
Kaveh Vahedipour b791188f18 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 17:49:11 +02:00
Andreas Streichardt 276803718d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 17:46:00 +02:00
Andreas Streichardt 0790b00737 hotfix for cluster startup 2016-05-02 17:45:39 +02:00
Max Neunhoeffer 12bf5a2dde Fix cluster.js. 2016-05-02 16:48:59 +02:00
Kaveh Vahedipour 00ce93b8d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 16:14:37 +02:00
Alan Plum 649c571e54
Prefer path.join over fs.join 2016-05-02 15:50:07 +02:00
Alan Plum 11c7db4375
Quality of life improvements in Foxx 2016-05-02 15:50:07 +02:00
Alan Plum e1d384813e
Make Foxx name/version optional 2016-05-02 15:50:06 +02:00
Andreas Streichardt 3e470891f8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 15:21:06 +02:00
Andreas Streichardt b55ac05a49 fix init 2016-05-02 15:20:31 +02:00
Alan Plum 53dc168a71
Linting 2016-05-02 14:42:10 +02:00
Alan Plum f81c946fd7
app -> service 2016-05-02 14:42:08 +02:00
Alan Plum ea7ff40a9c
Warn when specifying manifest.engine 2016-05-02 14:42:08 +02:00
Andreas Streichardt 5d7b8acba0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:00:50 +02:00
Andreas Streichardt 974ecdc208 Implement Current callback 2016-05-02 14:00:26 +02:00
Jan Steemann 4a8052e309 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-02 13:29:46 +02:00
Jan Steemann 2b0f3f7b57 change behavior of arithmetic operators, TO_STRING and TO_NUMBER 2016-05-02 13:29:29 +02:00
jsteemann fb912c28b6 jslint 2016-05-02 13:19:22 +02:00
Andreas Streichardt b1d4a9d9d7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 12:21:00 +02:00
Andreas Streichardt 18ea698038 Restructure code so that the installed versions are being returned by
the plan changer
2016-05-02 12:19:07 +02:00
Alan Plum 081a6f6a7f
Collection session storage should autoUpdate by default 2016-05-02 10:29:23 +02:00
Kaveh Vahedipour b962ee0b99 correct unit tests 2016-04-29 19:26:10 +02:00
Kaveh Vahedipour 82417a763e Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-29 16:37:18 +02:00
Alan Plum cc4ab07705
Session storage ttl should be specified in secs not mins 2016-04-29 16:36:26 +02:00
Kaveh Vahedipour 86959d83a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-29 16:29:05 +02:00
Alan Plum b83921bc62
jwt sessions: expiry -> ttl 2016-04-29 16:11:14 +02:00
Alan Plum 841790e524
Unbreak HTTP tests 2016-04-29 15:33:17 +02:00
jsteemann ea46d40bcd remove unused variable 2016-04-29 15:16:24 +02:00
Alan Plum fb2a9818e6
Session storages need both forClient and fromClient 2016-04-29 15:04:03 +02:00
Alan Plum 80dbea94a4
Make gharial behave better on errors again 2016-04-29 15:04:02 +02:00
jsteemann 3bb0f5fbe1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 14:52:30 +02:00
jsteemann ceb138d888 translate more errors 2016-04-29 14:30:11 +02:00
Alan Plum c829737568
Don't use _users in aardvark directly 2016-04-29 12:58:51 +02:00
Kaveh Vahedipour 4c3d906bd8 UserVersion, HB interval integers 2016-04-29 11:19:40 +02:00
Kaveh Vahedipour 7733e16392 UserVersion is a number 2016-04-29 10:45:27 +02:00
Kaveh Vahedipour ee2115ceeb remaining verbose output 2016-04-28 16:28:59 +02:00
Kaveh Vahedipour e81e3e51e0 javascript side of jsonified agency 2016-04-28 15:15:55 +02:00
Kaveh Vahedipour 6329d90155 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-27 17:27:52 +02:00
Kaveh Vahedipour bb834bb4a1 cluster startup ok. execept of corrdinator. 2016-04-27 17:27:06 +02:00
Kaveh Vahedipour 049cc8602e careful with loops :( 2016-04-27 16:53:09 +02:00
jsteemann 285da023e5 ShapedJson removal 2016-04-27 00:45:15 +02:00
Kaveh Vahedipour d4fc6a1062 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-25 18:37:32 +02:00
Kaveh Vahedipour 0530603763 dirty yet 2016-04-25 18:37:28 +02:00
Alan Plum 7b9085b009
Clear+recreate internal sessions to refresh them 2016-04-25 14:22:10 +02:00
jsteemann 58198a834e re-added options for foxx queues 2016-04-24 15:27:08 +02:00
Alan Plum 7653fe5eb8
Re-createSid on every access
There's no other way to prevent the internal sid from timing out apparently.
2016-04-21 15:14:01 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Max Neunhoeffer 646165f827 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-20 22:38:11 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections
Excluded Aardvark, the graph viewer in particular
2016-04-20 22:09:00 +02:00
Alan Plum e7e457b560
ES6ify 2016-04-20 18:34:46 +02:00
Alan Plum a3d5c64532
Object.extend is not a function 2016-04-20 18:13:04 +02:00
Alan Plum 0529471cdc
Allow passing an error to res.throw as reason 2016-04-20 18:11:49 +02:00
Max Neunhoeffer 13fdd67d38 Better timeouts in synchronisation in heartbeat thread. 2016-04-20 17:24:38 +02:00
Alan Plum 96aa1d9129
Add req.json 2016-04-20 17:18:51 +02:00
Alan Plum 7065d29975
Don't add default bodies 2016-04-20 17:18:51 +02:00
Alan Plum 2b0c1f6f9a
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 0fff3e661f
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 249dddcdf4
Optionally auto-update collection sessions 2016-04-20 15:23:02 +02:00
Alan Plum e7c0a49cfb
Don't use session.userData in system, always update lastAccess 2016-04-20 15:23:01 +02:00
Alan Plum 50ae4804f6
Spacing 2016-04-20 15:23:00 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Alan Plum 8b7a98f2e8
global.aqlQuery -> arangodb.aql 2016-04-20 13:05:27 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Alan Plum 494d5d5855
Foxx.getExports -> legacy 2016-04-19 18:16:18 +02:00
Alan Plum 17854b57a8
Formatting 2016-04-19 18:16:18 +02:00
Alan Plum 7b76519bbe
Allow res.throw(status, args) 2016-04-19 18:16:18 +02:00
Alan Plum 8a114a58d3
queues.js -> queues/index.js 2016-04-19 18:16:18 +02:00
Alan Plum 4c3319de25
Extract session storage.save
Also fix transports
2016-04-19 15:06:55 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Alan Plum ffcbd0a69e
Fix require tests 2016-04-19 09:29:24 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Alan Plum 051a153252
@arangodb/foxx -> @arangodb/foxx/legacy 2016-04-18 18:01:08 +02:00
Alan Plum c39eca49e4
Add require.aliases 2016-04-18 18:01:06 +02:00
Alan Plum 9f25f44a87
Don't check the Foxx store unless you actually need it 2016-04-18 18:01:06 +02:00
Alan Plum 02ee7c5489
Fix Foxx session transports error message 2016-04-18 18:01:04 +02:00
Alan Plum 4b509adf15
Nicer warnings/errors 2016-04-18 18:01:04 +02:00
Alan Plum 39754d700f
Unbreaky aardvark 2016-04-18 18:01:01 +02:00
Alan Plum 2382e6a6a7
Foxx services should survive even if API docs are broken 2016-04-18 18:01:00 +02:00
Alan Plum 96d0f5f4ab
QueryParam and friends should allow omitting schemas 2016-04-18 18:00:59 +02:00
Alan Plum 8224153c72
Prettier JSON responses in dev mode 2016-04-18 18:00:58 +02:00
Alan Plum 7bef673ef8
Fix empty descriptions in swagger 2016-04-18 18:00:58 +02:00
Alan Plum 46822f2335
Split body parsing and validation, add error cause 2016-04-18 18:00:56 +02:00
Alan Plum 7364c428e7
Add SyntheticRequest#database 2016-04-18 18:00:55 +02:00
Alan Plum aaaa3ca8f8
Add SyntheticResponse#throw 2016-04-18 18:00:54 +02:00
Alan Plum 106f14cffb
Nicer route error logging logic 2016-04-18 18:00:54 +02:00
Alan Plum b475e3cc09
Allow passing swagger object to swagger handler 2016-04-18 18:00:53 +02:00
Alan Plum b82f29fb42
Disable removed system services 2016-04-18 18:00:50 +02:00
Alan Plum 3fdd0a90e2
Better handle wrapped errors in Foxx 2016-04-18 18:00:49 +02:00
Alan Plum 30d6200a60
Allow passing strings as status code in some cases 2016-04-18 18:00:48 +02:00
Alan Plum 64d2b38025
Add _system sessions storage 2016-04-18 18:00:47 +02:00
Alan Plum 9e021cbc57
Fix transport.set call in sessions middleware 2016-04-18 18:00:46 +02:00
Alan Plum 5a3e42e289
Service#thumbnail should use path instead of base64 2016-04-18 18:00:46 +02:00
Alan Plum edbe1e966c
Add createSwaggerHandler to context 2016-04-18 18:00:45 +02:00
Alan Plum f13a827158
Fix new swagger 2016-04-18 18:00:45 +02:00
Alan Plum f6a0e4619d
Allow clearing removed sessions in transport 2016-04-18 18:00:45 +02:00
Alan Plum fbd2f3203a
Only serialize session if it is set 2016-04-18 18:00:44 +02:00
Alan Plum 5d69166a89
Fix cookie session transport signing 2016-04-18 18:00:44 +02:00
Alan Plum ef88a9d6eb
Consistency with args 2016-04-18 18:00:43 +02:00
Alan Plum 2dcadc06ea
Request path should be relative to service mount 2016-04-18 18:00:43 +02:00
Alan Plum a53e211452
Nested routers should allow sloppy paths too 2016-04-18 18:00:42 +02:00
Alan Plum 6473209430
Fix hasOwnProperty call 2016-04-18 18:00:42 +02:00
Alan Plum 40d66f932d
Allow defaultDocument but no default 2016-04-18 18:00:42 +02:00
Alan Plum f7f841c7c9
If auth config is a string, it's a method 2016-04-18 18:00:42 +02:00
Alan Plum 438b50e652
Extend Foxx session storage a bit 2016-04-18 18:00:41 +02:00
Alan Plum 989f87f732
Allow adding extra fields to error response from exception 2016-04-18 18:00:41 +02:00
Alan Plum 1430e24c3d
Linting 2016-04-18 18:00:41 +02:00
Alan Plum 4c42cc3e2f
Add FOTF swagger 2016-04-18 18:00:40 +02:00
Alan Plum 898f9bdcac
Move swagger into Foxx legacy 2016-04-18 18:00:40 +02:00
Alan Plum 80f7ffe876
Move OAuth2 into Foxx 2016-04-18 18:00:40 +02:00
Alan Plum 6c0cdeb4f1
Move simple-auth into Foxx 2016-04-18 18:00:40 +02:00
Alan Plum bb6b05b724
Make header transport API consistent with cookie 2016-04-18 18:00:39 +02:00
Alan Plum 5dfdd74c74
Add session collectionStorage 2016-04-18 18:00:39 +02:00
Alan Plum cae8a6607b
Add ServerRequest#params 2016-04-18 18:00:39 +02:00
Alan Plum 71ea230d4f
Fix defaultDocument in Foxx legacy
Opt-out values (i.e. empty strings) are now handled correctly again.
2016-04-18 18:00:38 +02:00
Alan Plum 9cf8d347ad
More SyntheticResponse tests 2016-04-18 18:00:38 +02:00
Alan Plum 21a1720d86
Add SyntheticResponse tests 2016-04-18 18:00:37 +02:00
Alan Plum 18ff55b7dd
Add SyntheticRequest tests 2016-04-18 18:00:37 +02:00
Alan Plum 2993b73c25
More SyntheticRequest tests 2016-04-18 18:00:37 +02:00