1
0
Fork 0
Commit Graph

346 Commits

Author SHA1 Message Date
Wilfried Goesgens a23aeefbd9 Another place we need the binaryPath for windows 2016-10-12 13:56:32 +02:00
jsteemann 0bfe4473ee fix compile warning 2016-10-10 17:10:55 +02:00
Andreas Streichardt e75b8f5503 Implement cURL based inter server communication 2016-10-10 14:56:04 +02:00
Jan Christoph Uhde ed111a39a1 Merge branch 'devel' into obi-velocystream-try-merge-devel
* devel: (24 commits)
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  fix perfsetupscript
  clean up perf script
  add SYSTEM flag to boost includes to avoid warnings
  Adding Foxx access to agency
  Adding Foxx access to agency
  fix compile warning
  Add missing windows library.
  fix windows compile problems.
  Fix syntax error in windows client installer.
  If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
  ...

Conflicts:
	arangod/Agency/AgentConfiguration.cpp
	arangod/GeneralServer/HttpCommTask.cpp
	arangod/RestServer/DatabaseFeature.cpp
	arangod/VocBase/datafile.cpp
2016-08-30 22:04:31 +02:00
Simran Brucherseifer dc8ced3a9b Fix comments 2016-08-29 11:52:09 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
jsteemann 2ab782aeb2 removed obsolete defines 2016-08-16 17:51:33 +02:00
jsteemann ae40ea5450 finally fixed some nasty bugs after refactoring 2016-08-15 14:26:09 +02:00
Jan Steemann ee8a8e2504 issue #1962 2016-07-25 11:37:29 +02:00
Jan Steemann a0ff5e9dc3 remove unused JsonHelper includes 2016-07-18 13:52:08 +02:00
Jan Steemann 69e037341b fixed my "optimization" 2016-07-08 15:42:27 +02:00
Jan Steemann 1e21fcfdf5 use compare() instead of find() 2016-07-08 12:09:44 +02:00
jsteemann 8f0991e18e potential performance optimizations
simplifications

small optimizations
2016-06-23 14:47:44 +02:00
jsteemann 28e8e64f44 fix SSL options, added option --server.max-packet-size 2016-06-13 15:16:50 +02:00
jsteemann 130493d481 micro optimizations 2016-05-11 21:02:20 +02:00
Frank Celler bf16086623 moved SSL files into separate directory 2016-05-11 16:34:03 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
jsteemann 56312353c8 cleanup 2016-05-04 01:51:19 +02:00
Andreas Streichardt b55ac05a49 fix init 2016-05-02 15:20:31 +02:00
Andreas Streichardt 194eb05a96 pendantic clang is pedantic 2016-05-02 12:32:38 +02:00
jsteemann 96fceb4411 use std::unordered_maps for headers 2016-05-01 20:52:47 +02:00
jsteemann 1250fcf63e micro optimizations 2016-05-01 00:03:23 +02:00
jsteemann 348e1e3397 client tools simplifications and fixes 2016-04-25 22:28:43 +02:00
Frank Celler d6e8046992 updated cleanupCFiles 2016-04-23 16:34:57 -07:00
Andreas Streichardt 30b71d0423 Wait 5ms when connection needs to be reestablished 2016-04-19 16:49:51 +02:00
Jan Steemann c0fd5c5f78 removal of some JSON 2016-04-12 18:21:11 +02:00
Jan Steemann 3a582af765 fix Windows build 2016-04-08 13:09:32 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Jan Steemann 4b0c01975b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:30:36 +02:00
Wilfried Goesgens 32338ef07f Also properly detect the end of the header when the server only sends \n 2016-04-07 14:26:44 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann eb82d96836 constexpr 2016-03-04 12:33:59 +01:00
jsteemann b3a20e915f simplified some logging 2016-02-24 22:48:56 +01:00
Wilfried Goesgens acc17daa96 Merge branch 'devel-solaris' of https://github.com/doublerebel/arangodb into doublerebel-devel-solaris
Fix Conflicts:
	arangod/FulltextIndex/fulltext-index.cpp
	lib/Basics/logging.cpp
2016-02-04 15:11:34 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +01:00
jsteemann 9482ee1cca use Logger 2016-01-30 00:08:35 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Charles Phillips a7c25d95f3 MSG_NOSIGNAL not supported on solaris platform 2016-01-25 23:29:05 -08:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
Jan Steemann 687d6133f0 comments reformatting 2016-01-11 09:52:39 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 50c0e18d53 removed useless con|destructor comments 2016-01-07 21:19:53 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
Jan Steemann 6ee9a6f90e replication fixes 2015-12-16 19:52:01 +01:00
Jan Steemann a694b7ef48 make_unique 2015-12-16 11:36:35 +01:00
Jan Steemann 223c44d572 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-15 12:02:47 +01:00
Jan Steemann 2b83e134f9 explicitly set closed flag 2015-12-15 11:58:32 +01:00
Michael Hackstein 5e39b1e811 Added a convenience function for default http result body parsing options 2015-12-09 21:46:13 +01:00
Michael Hackstein de588621bc Added a bodyToVelocyPack function for Simple Http Result 2015-12-09 21:10:15 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Jan Steemann cf7fa63a53 issue #1036: allow aborting waiting HTTP requests from the ArangoShell 2015-12-03 18:55:51 +01:00
Jan Steemann eb8899d9ae applied changes suggested by cppcheck 2015-12-02 10:17:14 +01:00
Jan Steemann 0dd207f9f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-01 11:14:12 +01:00
jsteemann 04e81ea851 more replication 2015-11-30 23:33:59 +01:00
Jan Steemann f013c809ea replication improvements 2015-11-30 18:27:31 +01:00
Jan Steemann b13284a0c3 replication improvements 2015-11-27 16:16:31 +01:00
Jan Steemann 9ef5b4746a removed several includes from Common.h 2015-11-25 12:21:55 +01:00
Jan Steemann c3f52d536e really fix compilation on Windows 2015-10-01 17:38:27 +02:00
Jan Steemann d916d2f577 try to fix compile error 2015-10-01 17:36:04 +02:00
Frank Celler 1e7d970a8d create timeout before the actual call 2015-10-01 12:00:00 +02:00
Jan Steemann 5bf02f9eb9 removed assert, because a clang 2015-09-07 11:31:19 +02:00
Jan Steemann 9228fd0e89 added assertions 2015-09-07 11:07:54 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Jan Steemann a3ee707f6f less creations of empty headers maps 2015-08-30 22:11:18 +02:00
Jan Steemann a9d63a0612 do not advertise support for delate encoding in `org/arangodb/request` by default 2015-08-29 02:46:01 +02:00
Jan Steemann abea80ac53 issue #1436: deflate responses encoded with `content-encoding: deflate`, too 2015-08-27 15:16:32 +02:00
Jan Steemann 9f0384284f moved files 2015-08-19 11:19:37 +02:00
Jan Steemann 57e9b55739 use TRI_CHAR_NODE_PAIR() 2015-08-14 00:54:59 +02:00
Jan Steemann 68d58248da allow non-const access to string-buffer 2015-08-07 13:29:38 +02:00
Jan Steemann 9778bc16fd fix Visual Studio compile errors 2015-08-07 11:07:56 +02:00
Jan Steemann 330fac6225 some unused function cleanup 2015-08-06 21:25:32 +02:00
Jan Steemann 472a0c76b1 do not read over the end of Buffer objects 2015-08-04 19:02:14 +02:00
Jan Steemann 35529ffd61 make more environment data available in --version 2015-08-04 11:21:50 +02:00
Jan Steemann 8b8d92a18c rearrange lock structs 2015-07-31 20:02:06 +02:00
Jan Steemann ec3ccd31ba split lock 2015-07-31 16:44:42 +02:00
Max Neunhoeffer eb011a0438 Use poll rather than epoll on Linux. 2015-07-31 15:11:32 +02:00
Jan Steemann 8fbf3894cd renamed 2015-07-31 14:56:52 +02:00
Jan Steemann 91e2497bcb use unordered_map 2015-07-30 20:45:35 +02:00
Jan Steemann f7ed62b04c hold locks for shorter periods in ConnectionManager 2015-07-30 20:03:23 +02:00
Jan Steemann 7f96c01d7b pacify Valgrind 2015-07-30 20:03:08 +02:00
Max Neunhoeffer 24eb98ed49 Fix select-related bug for cluster if file descriptors become to large.
Solution: Use epoll on Linux in SimpleHttpClient.
2015-07-30 15:21:56 +02:00
Jan Steemann 58d5da206d validate file descriptors against FD_SETSIZE 2015-07-30 13:59:57 +02:00
Jan Steemann 58a8f2a6a2 remove v8 dependency for arangoimp 2015-06-18 18:30:45 +02:00
Willi Goesgens 53a37ae387 Fix timeouts - followup of #cc427f9b1c0e28fec5abc312df606229195db7b8
- use TRI_microtime() instead of copying it with the name 'now()'
  - handle select-timeouts on non linux platforms.
2015-05-26 15:55:36 +02:00
Max Kellermann c9075aeacf lib/SimpleHttpClient: don't reset timeout after EINTR
select() modifies the given timeout variable.  Calling select() again
will run with the remaining timeout.  However, method prepare()
overwrote the reduced timeout in each iteration.
2015-05-26 15:03:11 +02:00
Jan Steemann 882f233fd8 constify 2015-05-21 09:56:37 +02:00
Jan Steemann 771f2db94b cleanup 2015-05-11 17:26:42 +02:00
Jan Steemann bb3f208a9b use block scope 2015-05-08 18:02:45 +02:00
Willi Goesgens 9018757846 If an HTTP-Requests fails, put the error message into the status object, so we can see more reasons in cluster errors. 2015-05-04 17:20:39 +02:00
Jan Steemann 32b547886b fixed up some headers 2015-04-24 13:11:29 +02:00
Frank Celler ffbc45d2e2 new HttpServer & HttpCommTask
Conflicts:
	Makefile.in
	arangod/Aql/RestAqlHandler.cpp
	arangod/Aql/grammar.cpp
	arangod/Cluster/RestShardHandler.cpp
	lib/GeneralServer/GeneralServer.h
	lib/GeneralServer/GeneralServerDispatcher.h
	lib/HttpServer/HttpServerJob.h
	lib/HttpServer/HttpsCommTask.h
	lib/SimpleHttpClient/SslClientConnection.cpp
2015-03-31 09:12:01 +02:00
Willi Goesgens 713a3fc657 Follow compile of openssl V 1.0.2: SSLV3 is deprecated. 2015-02-25 17:16:44 +01:00
Jan Steemann 0327608582 moved variable declaration 2015-02-17 17:55:15 +01:00
Jan Steemann 5da33a41d5 fixed memleak 2015-02-17 17:41:40 +01:00
Willi Goesgens b3684891d3 More work on getting smart error messages. 2015-02-02 17:55:13 +01:00
Willi Goesgens 85e5bc22d9 Propper error messages for windows and posix. 2015-01-30 14:38:32 +01:00
Willi Goesgens 73023291e9 Add SSL error handling inspired by curl; make shure the user gets the message. 2015-01-29 09:52:08 +01:00
Max Neunhoeffer e7d94bf81d Put a loop around select() to take care of EINTR. 2014-12-03 23:45:20 +01:00
Max Neunhoeffer 6e2aed2732 Take out cout debugging output. 2014-12-03 23:37:16 +01:00
Max Neunhoeffer 0fb6ef1968 Fix SimpleHttpClient for the n+1 time.
Still with debugging output.
2014-12-03 23:31:20 +01:00
Max Neunhoeffer 8182539b66 Introduce invariants in processHeader. 2014-12-03 16:46:18 +01:00
Max Neunhoeffer 7fd0260add Yet more printouts. 2014-12-03 13:30:43 +01:00
Max Neunhoeffer f5e5617155 One more cout. 2014-12-03 11:47:22 +01:00
Max Neunhoeffer 4b099281aa Take some couts out to reproduce bug. 2014-12-03 11:17:23 +01:00
Max Neunhoeffer d938a77531 Take out some couts to reproduce error. 2014-12-03 10:47:26 +01:00
Max Neunhoeffer 776ce77452 Fix a segfault in my couts. 2014-12-03 10:20:54 +01:00
Max Neunhoeffer 41785104d5 Even more couts. 2014-12-03 09:47:20 +01:00
Max Neunhoeffer 658256059f Yet more couts. 2014-12-03 09:44:22 +01:00
Max Neunhoeffer 41b01b78bc Even more couts. 2014-12-03 09:29:02 +01:00
Max Neunhoeffer 4125ffc5b1 Add some couts to finally debug SimpleHttpClient and shell-fm test. 2014-12-03 09:11:10 +01:00
Max Neunhoeffer dbf1f66841 Fix SimpleHttpClient for the n+1 time. Some major cleanup done.
Added a lot of comments to explain why it should work now properly.
2014-11-16 19:56:58 -05:00
Frank Celler ff199b60eb fixed server gone reconnet 2014-11-16 20:58:02 +01:00
Frank Celler cefba69ab5 fixed chunked again 2014-11-15 17:52:10 +01:00
Frank Celler 5a783df66f removed while loop 2014-11-15 17:19:26 +01:00
Frank Celler 77fd12b987 fixed SimpleHttpClient 2014-11-14 23:50:00 +01:00
Jan Steemann beafbe6a5c fixed invalid reads 2014-11-07 11:57:26 +01:00
Jan Steemann ccd20d7638 do not print broken error message 2014-10-28 01:02:24 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Jan Steemann 40e62e95a5 fixed out-of-scheduler-threads issue 2014-10-20 18:27:50 +02:00
Jan Steemann e28ad821b0 fixed spuriously occurring "database not found" error 2014-10-02 15:34:38 +02:00
Jan Steemann f3186fa065 cppcheck 2014-09-29 17:02:40 +02:00
Jan Steemann c8fba4c9be fixes for Visual Studio 2014-09-24 15:41:26 +02:00
Jan Steemann 1c134bd8a7 fixed off by one errors 2014-09-24 15:15:06 +02:00
Jan Steemann dbf964e204 small optimizations 2014-09-24 12:09:13 +02:00
Jan Steemann 506936dcdb rename orgy 2014-09-13 02:35:13 +02:00
Jan Steemann 669cb3b235 renamed files 2014-09-13 01:44:01 +02:00
Jan Steemann 42ba273589 prevent assertion failure 2014-07-02 18:52:29 +02:00
Jan Steemann 98a0ef0ded prevent endless connection attempts by arangosh 2014-07-02 15:18:24 +02:00
Jan Steemann 40473b58b7 safety 2014-07-02 12:19:28 +02:00
Jan Steemann 1b92282b32 less string buffer moves 2014-06-27 23:58:19 +02:00
Jan Steemann 76de1ae762 cppcheck 2014-06-27 22:20:17 +02:00
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
Jan Steemann b3d18d0deb cppcheck 2014-06-16 09:50:38 +02:00
Jan Steemann 51cb9257e5 speed up string-buffer reusage by simplehttpclient 2014-06-14 01:24:43 +02:00
Jan Steemann 89f6070e01 cppcheck 2014-06-11 17:53:44 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
2014-05-30 12:51:20 +02:00
Jan Steemann 4f3ed048e4 fixed disconnect of agency connections, use less CPU while spinning in agency methods 2014-05-28 13:44:35 +02:00