1
0
Fork 0
Commit Graph

113 Commits

Author SHA1 Message Date
Max Neunhoeffer af3c55d198 Fix a typo. 2014-07-07 12:13:01 +02:00
Frank Celler b536afd7f5 lower log level to debug 2014-07-07 12:11:37 +02:00
Frank Celler 60057037e2 added ERR_clear_error 2014-07-07 12:06:13 +02:00
Frank Celler 0c56fdc431 added state transition for WANT_READ and WANT_WRITE 2014-07-06 13:43:53 +02:00
Frank Celler 906fe27886 cosmetics 2014-07-06 13:43:52 +02:00
Frank Celler 093ee72467 removed superflous shutdown 2014-07-05 23:31:29 +02:00
Frank Celler dd006970cc shutdown SSL immediately 2014-07-05 23:02:30 +02:00
Frank Celler df997d0688 removed superflous socket and connection info 2014-07-05 22:18:34 +02:00
Jan Steemann 2babd2a1d2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-03 12:58:18 +02:00
Max Neunhoeffer c3fbfba2d9 Try to fix SSL problems, not yet working. 2014-07-03 11:24:05 +02:00
Jan Steemann 60fd8e44e4 nullptr 2014-07-03 10:17:10 +02:00
Jan Steemann 33be59ed7e cxx 2014-07-02 17:24:21 +02:00
Jan Steemann 98a0ef0ded prevent endless connection attempts by arangosh 2014-07-02 15:18:24 +02:00
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Max Neunhoeffer e7560357d2 Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Jan Steemann 8fa45ca181 added string task ids for periodic jobs 2014-05-08 22:59:36 +02:00
Frank Celler 8e9ad58f3b added cancelation of asnyc jobs
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Rest/Handler.h
2014-04-16 20:16:22 +02:00
Jan Steemann 2050049b06 added periodic job management
this adds functions internal.deletePeriod() and internal.getPeriodic()
functions internal.definePeriodic() now also has an extra parameter to
specify the name of a periodic job. this makes it more easy to tell
jobs apart in the result of internal.getPeriodic().
2014-04-13 22:19:46 +02:00
Jan Steemann 16edd4b767 variable alignment 2014-04-05 00:20:41 +02:00
Jan Steemann 6b42df078b sockets fix 2014-03-06 17:17:31 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +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 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Max Neunhoeffer dd3546ee40 Resolve socket bug under Windows. 2014-02-17 14:21:47 +01:00
Max Neunhoeffer 076bc6e723 Cleanup socket abstraction for different OSes. 2014-02-14 14:44:27 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
2013-12-20 15:35:50 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
2013-12-13 17:58:24 +01:00
Jan Steemann f0184d2786 not sure about the restshardhandler yet 2013-12-12 17:51:45 +01:00
Jan Steemann 8eccb0a35f added dispatcher to shardhandler 2013-12-12 16:42:25 +01:00
Jan Steemann 0014777746 improve error message 2013-10-30 14:38:20 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 709198c340 updated docs for /_api/jobs 2013-09-28 00:44:03 +02:00
Jan Steemann e3d9d95f3f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	lib/Admin/ApplicationAdminServer.cpp
	lib/GeneralServer/GeneralServerDispatcher.h
2013-09-26 17:46:05 +02:00
Jan Steemann 5a422becd8 async job management 2013-09-26 17:30:03 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann 73f0405ead added documentation for endpoints 2013-09-23 16:21:02 +02:00
Jan Steemann ed163164c4 fixed queue naming 2013-09-20 13:17:32 +02:00
Jan Steemann 6902ae5670 added support for async requests 2013-09-20 12:32:46 +02:00
Jan Steemann 2eb0871813 updated TODOs 2013-09-12 18:46:19 +02:00
Jan Steemann 6ff314de0e runtime addition and removal of endpoints 2013-09-12 18:07:39 +02:00
Jan Steemann a53c1e493b multiple database, becoming standard 2013-09-02 09:52:52 +02:00
Jan Steemann 5ba876978b removed unused private variable (fixes compiler warning) 2013-06-28 15:44:59 +02:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Oreste Panaia fc5e1ba623 merge conflicts with devel 2013-02-28 19:42:58 +08:00
Oreste Panaia a48696ec28 network modifications required for windows 2013-02-28 17:43:39 +08:00
Oreste Panaia 9e69106c90 Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2 2013-02-22 16:58:06 +08:00
Oreste Panaia ea601a23b3 Socket changes for windows libev 2013-02-22 16:51:13 +08:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00