1
0
Fork 0
Commit Graph

1540 Commits

Author SHA1 Message Date
Jan Steemann 910996529c windows 2014-03-07 11:45:55 +01:00
Jan Steemann 6b42df078b sockets fix 2014-03-06 17:17:31 +01:00
Jan Steemann 79defc2ef1 -Wunreachable-code reverted. Visual Studio doesn't like it 2014-03-06 11:36:58 +01:00
Jan Steemann c5c294aa6b -Wunreachable-code 2014-03-06 11:30:38 +01:00
Jan Steemann 84364a7601 fixed socket shutdown on Windows 2014-03-06 10:34:29 +01:00
Jan Steemann e9d2d555af renamed parameter to silence compilers 2014-03-06 10:34:13 +01:00
Frank Celler 0684d0bda4 added vista locks
Conflicts:
	GNUmakefile
	lib/BasicsC/locks-win32.c
	lib/BasicsC/locks-win32.h
2014-03-05 14:22:27 +01:00
Jan Steemann 3451c8a03e fixed createNonce call 2014-03-05 10:46:52 +01:00
Max Neunhoeffer 63bcda3c78 Fix a typo for Windows. 2014-03-04 13:13:10 +01:00
Max Neunhoeffer dcb2feccd0 Another try to fix process startup under Windows. 2014-03-04 12:31:14 +01:00
Max Neunhoeffer e652d663bf Fix socket closing under Windows. 2014-03-04 11:23:11 +01:00
Max Neunhoeffer c298863dd1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 10:58:13 +01:00
Max Neunhoeffer 41eaf9aaab Under Windows, do only SO_EXCLUSIVEADDRUSE. 2014-03-04 10:57:46 +01:00
Jan Steemann c18055b284 fixed compiler warning 2014-03-04 10:41:55 +01:00
Max Neunhoeffer 1cb38c6aca Fix compilation under windows. 2014-03-04 08:53:16 +01:00
Jan Steemann 9cdd453043 fixed compiler warning 2014-03-03 19:25:42 +01:00
Max Neunhoeffer e280ea9e91 First try to cleanup process startup for good.
Unix: compiles and works.
Windows: tried to cleanup, did not try to compile yet.
2014-03-03 17:02:16 +01:00
Jan Steemann 3478c8bc74 cppcheck 2014-03-03 09:12:34 +01:00
Frank Celler f4dd63e55d Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-03-02 13:41:59 +01:00
Frank Celler e0552606c3 added residentSizePercent 2014-03-01 18:16:58 +01:00
Frank Celler cdf635d5c6 added residentSizePercent 2014-03-01 18:14:14 +01:00
Frank Celler 58ca2f9647 added windows mem function 2014-03-01 17:28:06 +01:00
Frank Celler d37a5221ab added pyhsical memory for linux 2014-03-01 17:23:20 +01:00
Frank Celler e70c9bed21 added total memory for mac 2014-03-01 17:16:10 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/V8PeriodicJob.cpp
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
2014-02-28 20:37:05 +01:00
Max Neunhoeffer a264b55f32 Fight zombies. 2014-02-28 20:24:42 +01:00
Max Neunhoeffer 7a767b25ac waitpid for a child even if we do no longer know it. 2014-02-28 20:20:43 +01:00
Esteban Lombeyda 751046e6f1 using white spaces instead tabulators 2014-02-28 19:01:35 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Frank Celler a764a9a772 changed info to debug 2014-02-28 12:28:31 +01:00
Frank Celler 1aa3a02167 changed default log level to warning 2014-02-28 12:25:30 +01:00
Esteban Lombeyda 85e824f1c8 Bug Fix: compiler error
: searching strategy for installation directory upgraded
2014-02-28 12:07:29 +01:00
Frank Celler e8a638f1b5 only support programm suffix 2014-02-27 21:38:34 +01:00
Frank Celler 56536adb96 set log level as soon as possible 2014-02-27 18:47:16 +01:00
Jan Steemann 242b3d5bbf const 2014-02-26 11:08:21 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
2014-02-25 17:21:14 +01:00
Jan Steemann edfdda6d12 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 15:44:08 +01:00
Jan Steemann 0ac7ddaaf9 fix shell client test results 2014-02-25 15:43:57 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Jan Steemann b42f836202 prevent JSONification of cyclic objects 2014-02-24 14:50:47 +01:00
Max Neunhoeffer 826714c1b3 Document REUSEADDR setup. 2014-02-24 12:54:21 +01:00
Max Neunhoeffer 70c541fec6 Sort out REUSEADDR matter for good? 2014-02-24 12:40:48 +01:00
Jan Steemann 870f969933 added user validation API at POST `/_api/user/<username>` 2014-02-24 11:12:37 +01:00
Max Neunhoeffer a762a8c32c Default for SOCK_REUSEADDR is false. 2014-02-24 11:04:38 +01:00
Max Neunhoeffer 2315bc2c87 Cleanup TRI_GetAbsolute code. 2014-02-24 09:25:52 +01:00
Frank Celler a2fb92948e added better error reporting 2014-02-22 13:00:00 +01:00
Jan Steemann 00d8a9023f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-21 17:40:38 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
2014-02-21 15:28:21 +01:00
Max Neunhoeffer 4e847c508c Fix a comment. 2014-02-21 15:15:40 +01:00
Max Neunhoeffer f3abfaa1b1 Fix a deadlock situation in the SimpleHttpClient if the server dies. 2014-02-21 15:14:43 +01:00
Jan Steemann 211b0da24b moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer 2014-02-21 14:44:18 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
2014-02-20 21:02:07 +01:00
Frank Celler 38f1e55f99 ignore cache 2014-02-20 20:35:18 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann 68707cabad better error message if keyfile cannot be found 2014-02-20 18:06:25 +01:00
Max Neunhoeffer e7730b6a16 Kill process under Unix even when it is not known. 2014-02-20 10:17:16 +01:00
Max Neunhoeffer a58e261f16 Repair windows executeExternal. 2014-02-19 15:46:16 +01:00
Max Neunhoeffer 074ef1cb31 Unify process startup between Windows and not. 2014-02-19 15:01:37 +01:00
Jan Steemann 79408d479a removed unused functions 2014-02-19 11:44:51 +01:00
Max Neunhoeffer 6b3cfa1256 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-19 11:13:16 +01:00
Max Neunhoeffer c756f0bb04 Fix command line quoting for Windows. 2014-02-19 11:12:03 +01:00
Frank Celler 066abd777c Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-02-19 10:21:00 +01:00
Frank Celler da7d64bba9 removed wow6432 hack 2014-02-19 10:13:30 +01:00
Max Neunhoeffer 3a121b4082 First try to fix Windows command line arg quoting. 2014-02-19 09:58:20 +01:00
Max Neunhoeffer c3c2cba69b Build up command line arguments for windows process startup. 2014-02-18 15:34:29 +01:00
Max Neunhoeffer e66afb062c Fail hard if a configuration option cannot be parsed. 2014-02-18 12:11:34 +01:00
Max Neunhoeffer bc99b765d0 Add wait argument to statusExternal.
Windows version untested.
2014-02-17 16:40:11 +01:00
Max Neunhoeffer 99df09decb Fix cmake entry for RestShutdownHandler 2014-02-17 16:30:23 +01:00
Max Neunhoeffer c2cb8c20cb Fix casting bug. 2014-02-17 14:45:47 +01:00
Max Neunhoeffer 75eff02608 Please the compiler under Windows. 2014-02-17 14:27:46 +01:00
Max Neunhoeffer dd3546ee40 Resolve socket bug under Windows. 2014-02-17 14:21:47 +01:00
Max Neunhoeffer 3d27a9f0ad Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-14 14:44:45 +01:00
Max Neunhoeffer 076bc6e723 Cleanup socket abstraction for different OSes. 2014-02-14 14:44:27 +01:00
Frank Celler 6269c61aa7 Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 14:21:59 +01:00
Jan Steemann f8476ce0b0 fixed tests 2014-02-13 18:14:53 +01:00
Esteban Lombeyda d6094cf5de Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 16:41:38 +01:00
Esteban Lombeyda 6ccfa1aad2 starting and killing of windows process was implemented 2014-02-13 16:30:31 +01:00
Jan Steemann bb0f591349 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 15:33:39 +01:00
Frank Celler 739900fc2f try to force abort 2014-02-13 12:06:52 +01:00
Jan Steemann fc84d4c005 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 11:18:49 +01:00
Frank Celler 95472a82eb Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
2014-02-13 11:07:01 +01:00
Frank Celler 7a3176ac8d use new readline per default for mac 2014-02-13 11:03:48 +01:00
Jan Steemann 4fc8cae57d index creation with ids 2014-02-13 11:00:08 +01:00
Jan Steemann c4d52ff133 getIndexes, dropIndex 2014-02-12 17:09:47 +01:00
Max Neunhoeffer 5c467148a3 Add HTTP REST API call for shutdown. 2014-02-12 10:47:43 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
2014-02-11 15:52:49 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
Max Neunhoeffer 650343a650 Fix download using different ports than 80.
Handle errors better in SYS_TEST_PORT
2014-02-11 09:51:36 +01:00
Jan Steemann 399ddebbd3 ensureIndex 1st 2014-02-10 14:36:32 +01:00
Esteban Lombeyda dbc4ef79eb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-07 16:33:52 +01:00
Esteban Lombeyda 8ab6290d65 Bug fix: tabulators work correct under microsoft windows. Needs 49ee3f0d0fc80cce300427a2ddbf519c61a7cb24
of ArangoDB-Windows
2014-02-07 16:30:04 +01:00
Jan Steemann b4d9f10f17 fixed some database methods 2014-02-06 15:54:34 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
2014-02-06 13:18:52 +01:00
Jan Steemann 57365cdcb0 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-06 12:17:51 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Max Neunhoeffer 91fc65ba8d Change signal from SIGKILL to SIGTERM because it is more friendly. 2014-02-06 12:06:06 +01:00
Max Neunhoeffer 340549624b Redirect on 307 as well if requested. 2014-02-06 09:14:27 +01:00
Jan Steemann 58b3e0f99d splitted a few tests 2014-02-05 15:15:51 +01:00
Jan Steemann 0087a5a877 issue #756: white-listed `server` header 2014-02-05 09:12:03 +01:00
Jan Steemann 79190570ba issue #756: set access-control-expose-headers on CORS response
the following HTTP headers are now whitelisted by ArangoDB in CORS responses:
- etag
- content-encoding
- content-length
- location
- x-arango-errors
- x-arango-async-id
2014-02-04 18:09:58 +01:00
Max Neunhoeffer e42ac23b0f Remove debugging code. 2014-02-04 16:21:18 +01:00
Max Neunhoeffer 56a629b795 Startup agents seems to work. 2014-02-04 14:44:56 +01:00
Max Neunhoeffer 73b4222089 Fix a bug in StartExternalProcess. 2014-02-04 14:05:31 +01:00
Max Neunhoeffer 6e08a96795 Fix bug with empty argument in makeAbsolute. 2014-02-04 11:50:21 +01:00
Max Neunhoeffer 0c8de8a3ae Add fs.makeAbsolute needed by kickstarter. 2014-02-04 11:36:28 +01:00
Jan Steemann 545742a5fd added option `--server.disable-authentication-unix-sockets`
with this option, authentication can be disabled for all requests coming
in via UNIX domain sockets, enabling clients located on the same host as
the ArangoDB server to connect without authentication.
Other connections (e.g. TCP/IP) are not affected by this option.

The default value for this option is `false`.
Note: this option is only supported on platforms that support Unix domain
sockets.
2014-02-02 00:22:07 +01:00
Max Neunhoeffer c2e6c16395 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 19:34:55 +01:00
Max Neunhoeffer b6c3600ecc Add an include needed to please the compiler on Linux. 2014-01-31 19:31:36 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Frank Celler 988bd0b891 added port test 2014-01-31 18:38:02 +01:00
Frank Celler 29f075cfce added external processes 2014-01-31 15:55:51 +01:00
Jan Steemann 9643469631 do not allow changing shard key attributes 2014-01-31 13:19:03 +01:00
Max Neunhoeffer 6f71c60b0c Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-30 20:47:34 +01:00
Max Neunhoeffer ca2c4cdf52 Exorcise closing of connections in SimpleHttpClient. 2014-01-30 20:46:26 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Frank Celler 973f9aa2fb added linenoise 2014-01-30 17:23:24 +01:00
Jan Steemann 5f8a59d696 all() sharded 2014-01-29 13:51:12 +01:00
Jan Steemann e2a7e2dfb3 windows 2014-01-28 17:32:32 +01:00
Max Neunhoeffer c3f01237b0 Implement replace and update on cluster.
This still has a freeing too early bug with TRI_json_t.
2014-01-28 16:49:44 +01:00
Jan Steemann e906f68235 windows fixes 2014-01-27 17:46:15 +01:00
Jan Steemann 894ea527a6 testing readline... 2014-01-27 17:06:27 +01:00
Jan Steemann bae529c4e4 testing readline... 2014-01-27 17:04:27 +01:00
Jan Steemann 2ced0f6a21 fixed terminal reset 2014-01-27 16:54:48 +01:00
Jan Steemann f232becd2e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-27 09:45:52 +01:00
Jan Steemann 1b08bc6582 start up the HTTP server when starting ArangoDB in console mode 2014-01-27 09:45:26 +01:00
Frank Celler b5905a293b Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	Documentation/RefManual/Actions.md
	Documentation/UserManual/Foxx.md
	Documentation/UserManual/UserManual.md
	lib/ProgramOptions/program-options.c
2014-01-25 22:30:04 +01:00
Frank Celler 116873c041 check for null pointer for ROOTDIR 2014-01-25 21:09:16 +01:00
Max Neunhoeffer 7d5723756f Implement DELETE REST method on the coordinator. 2014-01-24 21:31:58 +01:00
Jan Steemann ea2af50683 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	Documentation/ImplementorManual/HttpSystem.md
	js/apps/system/aardvark/aardvark.js
	js/apps/system/aardvark/frontend/css/buttons.css
	js/server/version-check.js
2014-01-24 14:50:09 +01:00
Jan Steemann d8b5c60351 fixed segfault 2014-01-24 13:08:33 +01:00
Max Neunhoeffer f5c274e8c0 Fix error handling and another bug in create document for cluster. 2014-01-24 10:35:37 +01:00
Jan Steemann 8283b61c7b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-23 16:42:55 +01:00
Jan Steemann b1fccd1bb0 added tests for JSON hashing 2014-01-23 16:42:42 +01:00
Max Neunhoeffer 9230f5020c First case of create document is working on cluster. 2014-01-23 16:16:06 +01:00
Max Neunhoeffer 165d98578a First hack at create document via REST on cluster. 2014-01-23 13:00:44 +01:00
Jan Steemann 587c2aef64 issue #744
Conflicts:
	lib/ApplicationServer/ApplicationServer.cpp
2014-01-23 09:58:18 +01:00
Jan Steemann a9b579f1b1 issue #744 2014-01-23 09:47:22 +01:00
Max Neunhoeffer 0b2ff098f3 Start to use shared_ptr from boost. 2014-01-22 16:20:34 +01:00
Max Neunhoeffer 2d44e85f6d Add hashing of TRI_json_t to uint64_t. 2014-01-22 16:20:05 +01:00
Jan Steemann 80e8250d54 fixed segfault 2014-01-21 12:50:35 +01:00
Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-01-21 09:29:45 +01:00
Jan Steemann a2e11e606b added graph-specific error code 2014-01-18 01:08:24 +01:00
Jan Steemann c7457ff8f5 updated documentation 2014-01-17 17:10:53 +01:00
Jan Steemann 622edb0fee updated documentation 2014-01-17 17:10:06 +01:00
Max Neunhoeffer 6b4bbe5d04 Fix a description of two methods. 2014-01-17 10:59:23 +01:00
Max Neunhoeffer 92e52c33f8 Add a note about a possible bug. 2014-01-17 09:06:35 +01:00