Commit Graph

1449 Commits

Author SHA1 Message Date
Travis Reeder
605806ed6e Merge branch 'master' of https://gitlab-odx.oracle.com/odx/functions 2017-07-25 11:09:32 -07:00
Travis Reeder
147826db50 Added tmp to gitignore. 2017-07-25 11:09:29 -07:00
James Jeffrey
f1d6bfcb96 Merge branch 'improve-tests' into 'master'
Improving API tests

See merge request !123
2017-07-25 10:29:20 -07:00
Denis Makogon
5b41fe2dc7 Improving API tests 2017-07-25 10:29:20 -07:00
Reed Allman
e0569192ee Merge branch '103' into 'master'
Ensure app exists before listing its routes

Closes #103

See merge request !106
2017-07-25 10:16:07 -07:00
Denis Makogon
5ed3e79b63 Adding comment with the reason for doing this 2017-07-25 20:09:05 +03:00
Reed Allman
5ea70791a5 Merge branch '113' into 'master'
Use coma as separator for multi-value headers

Closes #113

See merge request !128
2017-07-25 10:08:44 -07:00
Reed Allman
dc3ccc5d02 Merge branch 'enqueue-error' into 'master'
Reject async requests in case if MQ is not reachable

Closes #141

See merge request !127
2017-07-25 10:03:04 -07:00
Denis Makogon
97b0b97bd8 Reject async requests in case if MQ is not reachable 2017-07-25 10:03:04 -07:00
Denis Makogon
efa75dfbb7 Use coma as separator for multi-value headers
Fixes: #113
2017-07-25 19:30:31 +03:00
Travis Reeder
565f61fe6f Merge branch 'tracing' into 'master'
add opentracing spans for metrics

See merge request !122
2017-07-25 08:55:22 -07:00
Reed Allman
dc5e67b6d2 add opentracing spans for metrics 2017-07-25 08:55:22 -07:00
Denis Makogon
bdffa75762 Fixing tests 2017-07-25 08:57:37 +03:00
Denis Makogon
b3ba42e3b9 Fixing fmt 2017-07-25 08:57:37 +03:00
Denis Makogon
4f5197a1c2 Fixing tests and addressing comments 2017-07-25 08:57:37 +03:00
Denis Makogon
48484be608 Ensure app exists before listing its routes 2017-07-25 08:57:05 +03:00
Reed Allman
1cc1a5ad49 Merge branch 'rm-inspect' into 'master'
remove docker inspect container

See merge request !126
2017-07-24 15:44:44 -07:00
Reed Allman
c215dcf5dd remove docker inspect container
we had the inspect container here for 3 reasons:

1) get exit code
2) see if container is still running (debugging madness)
3) see if docker thinks it was an OOM

1) is something wait returns, but due to 2) and 3) we just delayed it until
inspection

2) was really just for debugging since we had 3)

3) seems unnecessary. to me, an OOM is an OOM is an OOM. so why have a whole
docker inspect call just to find out? (we could move this down, since it's a
sad path, and make the call only when necessary, but are we really getting any
value from this distinction anyway? i've never ran into it, myself)

inspect was actually causing tasks to time out, since the call to inspect
could put us over our task timeout, even though our container ran to
completion. we could have fixed this by checking the context earlier, but we
don't really need inspect either, which will reduce the docker calls we make,
which will make more unicorn puppers. now tasks should have more 'true'
timeouts.

tried to boy scout, but tracing patch also cleans this block up too.
2017-07-24 13:37:29 -07:00
James Jeffrey
1e74cd5c4c : 0.3.24 release [skip ci] 2017-07-24 13:30:08 -07:00
James Jeffrey
9f9c9cc40e Merge branch 'add_max_conns' into 'master'
Add max cons 1 if sqlite3

See merge request !124
2017-07-24 13:11:55 -07:00
James Jeffrey
9917815214 Add max cons 1 if sqlite3 2017-07-24 13:04:08 -07:00
Reed Allman
2c3ab08589 Merge branch 'rm-nanny' into 'master'
remove the nanny

See merge request !125
2017-07-24 12:59:13 -07:00
Reed Allman
afcec04c24 remove the nanny
we finally graduated high school and can make our own ramen

we no longer need this since fn appears to have no concept of canceling tasks
through an api we need to watch, and the context is plumbed if the request is
canceled. since tasks are short, we may never need to do cancellation of
running tasks like we had with iron worker. this was an added docker call
that's unnecessary since we are doing force removal of the container at the
end anyway.
2017-07-24 11:56:58 -07:00
James Jeffrey
8d836d5956 fn tool: 0.3.18 release [skip ci] 2017-07-24 08:34:53 -07:00
James Jeffrey
40f911c566 : 0.3.23 release [skip ci] 2017-07-24 08:33:43 -07:00
James Jeffrey
e572cb93ec Merge branch 'test_ci_integration_local_code' into 'master'
Test ci integration local code

See merge request !121
2017-07-21 16:18:48 -07:00
James Jeffrey
9654fd4179 Make tests use local functions server not one in container 2017-07-21 16:12:33 -07:00
Denis Makogon
0ac91e6e7c Run tests against sqlite3 2017-07-21 16:07:17 -07:00
Denis Makogon
84c9bb9b93 Increase startup timeouts 2017-07-21 16:07:17 -07:00
Denis Makogon
823ee23d37 More verbosity 2017-07-21 16:07:17 -07:00
Denis Makogon
a83cc89968 Increasing MySQL startup timeout 2017-07-21 16:07:17 -07:00
Denis Makogon
edde79e061 Trying to figure out networking problems 2017-07-21 16:07:16 -07:00
Denis Makogon
bcd79ce4a6 Enable integration tests in CI 2017-07-21 16:07:16 -07:00
Denis Makogon
31e14843fe Enabling API tests in CI 2017-07-21 16:07:16 -07:00
James Jeffrey
4ddf7c1454 Merge branch 'respect_original_cancel' into 'master'
Kill the server if original context is canceled

See merge request !120
2017-07-21 16:05:23 -07:00
James Jeffrey
b9b87fc81f Kill the server if original context is canceled 2017-07-21 16:01:18 -07:00
James Jeffrey
f63804aa8b Merge branch 'update-tests' into 'master'
Increase tests timeouts for API tests

See merge request !119
2017-07-21 14:55:50 -07:00
Denis Makogon
96cf246cb3 Increase tests timeouts for API tests 2017-07-21 23:45:05 +03:00
James Jeffrey
75ac1cc05e Merge branch 'move-api-tests' into 'master'
Moving tests from CLI to server

See merge request !118
2017-07-21 12:48:03 -07:00
Denis Makogon
be3662743e Removing tests from CLI 2017-07-21 22:42:44 +03:00
Denis Makogon
9400a83aa8 Moving tests from CLI to server 2017-07-21 20:03:43 +03:00
James Jeffrey
fae48afaa4 fn tool: 0.3.17 release [skip ci] 2017-07-20 10:15:29 -07:00
James Jeffrey
5d3fd6bd98 : 0.3.22 release [skip ci] 2017-07-20 10:14:48 -07:00
James Jeffrey
8cbddec676 Merge branch 'fn-build-no-cache-support' into 'master'
Teach `fn build` `--no-cache` to avoid using cached steps

See merge request !114
2017-07-20 09:54:14 -07:00
Will Price
c734efefce Teach fn build --no-cache to avoid using cached steps 2017-07-20 09:54:14 -07:00
Travis Reeder
0b736b4b1c Merge branch 'clean-up-dockerfile-orphans' into 'master'
Clean up dockerfile orphans

See merge request !112
2017-07-20 09:03:27 -07:00
Jan Grant
7e9fabd7b0 Clean up dockerfile orphans 2017-07-20 09:03:27 -07:00
Derek Schultz
0879fce4ce Merge branch 'expiring-cache' into 'master'
Expiring cache

Closes #115

See merge request !116
2017-07-20 08:44:56 -07:00
Travis Reeder
c3630eaa41 Expiring cache 2017-07-20 08:44:56 -07:00
James Jeffrey
2be96689d4 : 0.3.21 release [skip ci] 2017-07-19 16:02:02 -07:00