254e8c65d1
adjusted log levels for docker exit and kill messages
2017-01-11 16:04:55 +01:00
f2db88f952
Merge branch 'master' into travis-green-docker
...
took all the newer versions. Only thing I deleted is the part #to pass the test "it executes the run command" ...
We need to shortly discuss this yqbk.
Conflicts:
lib/docker_client.rb
2016-11-09 18:25:02 +01:00
c937a1a9ef
clean pull request
2016-10-24 23:02:44 +02:00
f055e6813d
changes in travis
2016-10-16 17:21:54 +02:00
1f24e48c5c
enable docker initialize
2016-10-11 16:45:56 +02:00
1945a47109
apply changes after review
2016-10-11 12:44:16 +02:00
1dfd6f61dc
some more relative url roots in editor_edit, removed javascript uglifying for staging, added debug message for docker websocket connection url.
...
added doku for setting up docker daemon for codeocean
2016-10-07 14:16:24 +02:00
6ff3d36809
Fixed container-ending on exit.
2016-09-09 17:06:30 +02:00
032c201b94
repair database query
2016-08-03 14:08:01 +02:00
4183a16178
merge with master
2016-08-03 12:09:58 +02:00
d29cf9cf61
Also support run output for QaApi
2016-06-17 19:22:25 +02:00
ed20a30517
reverse some changes
2016-06-07 13:52:01 +02:00
8c9c798a0d
solve execute_run_command error
2016-05-30 17:02:29 +02:00
060f9687f1
use pry-byebug gem instead for pry (recommended for ruby 2.x)
2016-05-30 15:47:06 +02:00
2850e562cc
changes in gemfile
2016-05-30 15:18:02 +02:00
7bc3c4e27c
Fix tests in models/execution_environment_spec.rb, uncomment @image in lib/docker_client.rb
2016-05-25 15:56:49 +02:00
4df7bc825b
tests creates the workspace files and takes a container from the pool in docker_client_spec.rb repaired
2016-05-24 16:03:55 +02:00
a4a8b6393d
test creates the workspace files repaired
2016-05-24 15:59:10 +02:00
b31a5b37f4
renamed execute_websocket_command to open_websocket_connection, because we now run the command after all listeners in the submissions controller were attached
2016-03-01 11:34:07 +01:00
94c31e35a4
Some comments and cleanup of exercise.rb percentage calculation
2016-03-01 11:14:53 +01:00
61426e8f2e
uncomment some logging, and recreate folder for local workspace path in the docker client.
2016-01-27 15:49:38 +01:00
ecad5b80fa
re-enable data submission via shared folders.
2016-01-27 10:16:13 +01:00
f53457644c
just remove subfolders of CONTAINER_WORKSPACE_PATH, do not create target folder manually.
2016-01-25 11:19:56 +01:00
d1e0f31963
uncomment sleep 1000
2016-01-25 11:10:41 +01:00
113f765246
docker_client file copy work in progress
2016-01-25 11:07:52 +01:00
c77d52c0e4
instead of relying on shared folders, use docker api archive function. un tar is still a bit cumbersome, but works.
2016-01-19 15:41:03 +01:00
f928874189
directly call proc (before execution block) and rescue from an exception if it happens instead of using try, in order to log the error.
2015-12-16 16:30:54 +01:00
c0955d3505
Just some comments and todos
2015-12-12 00:47:29 +08:00
6170068f24
Major improvement in container fetching. ToDo: Check how much stress this puts on the docker daemon (I assume it is not that much).
...
+ some more rescue code (in return container) as well as logging fixes.
2015-11-28 16:20:16 +01:00
ae9cfaebf8
some logging and some rescues
2015-11-28 16:10:13 +01:00
207ff90fc8
remove this again. it caused immediate exit.
2015-11-11 00:25:26 +01:00
b1733d1a16
ensure database connection removal activated again
2015-11-10 15:04:21 +01:00
e927a39041
removed calls to the docker daemon, to hopefully solve load problems.
2015-11-09 19:26:56 +01:00
b05b24ee62
some more logging
2015-11-09 10:23:26 +01:00
7f3189615f
temporarily uncomment database connection removal (in order to be sure that this does not cause problems)
2015-11-09 09:38:44 +01:00
0fd20c479b
set encoding utf-8 for stdout and stderr from docker
2015-11-08 23:55:45 +01:00
1aa877d506
release database connections after thread termination of the "kill after timeout thread"
2015-11-08 12:39:42 +01:00
eb8c0e46fa
Some logging, some code simplification, clear canvas on start
2015-11-03 15:54:08 +01:00
ef60494911
some more logging (and cleanup)
2015-10-29 16:27:12 +01:00
b89bd9d521
Turn off log synchronization for websockets. Otherwise, we can't reuse the containers (and terminals)
2015-10-28 16:42:34 +01:00
58b137408e
exit the timeout thread on proper exit
2015-10-28 16:25:53 +01:00
30d0270744
Show correct timeout message on timeout. Do not show a message on valid exit.
2015-10-21 17:18:28 +02:00
863ce5d398
Corrected position of setting the container status flags.
2015-10-19 17:48:36 +02:00
9e748e5dc9
prevent nil access on containers not present any longer in delete...
2015-10-19 15:52:48 +02:00
1360408dce
Fix container pooling with websockets
2015-10-19 14:46:32 +02:00
13be0f65dd
Improve error and output handling
...
Display websocket and container status messages as well as line feeds
to the user.
2015-09-16 19:14:36 +02:00
81aa5d5d8f
Fixed submission-scoring.
...
Added parsing of exit cmd.
2015-09-16 18:34:04 +02:00
c8253a6ba0
Manually merge changes from webpython branch.
2015-09-15 16:55:16 +02:00
bc51948ada
fixed some tests..
2015-08-25 16:02:14 +02:00
8bb98dc8e9
fixed some errors concerning pooling, container cleanup, timeouts etc.
2015-08-21 16:32:25 +02:00