Fixes #17239 - Increase scap content validation timeout #227
Conversation
| private | ||
|
|
||
| def timeout | ||
| Setting[:proxy_request_timeout] > 120 ? Setting[:proxy_request_timeout] : 120 |
There was a problem hiding this comment.
I think you need something like Setting[:proxy_request_timeout] && Setting[:proxy_request_timeout] > 120 for tests to pass.
shlomizadok
force-pushed
the
fix_17239
branch
from
218640b
to
3ee38bb
Compare
| private | ||
|
|
||
| def timeout | ||
| (Setting[:proxy_request_timeout] && Setting[:proxy_request_timeout] > 120) ? Setting[:proxy_request_timeout] : 120 |
There was a problem hiding this comment.
Omit parentheses for ternary conditions.
shlomizadok
force-pushed
the
fix_17239
branch
from
3ee38bb
to
bf1be27
Compare
|
test failures are unrelated |
|
Seems to take care of timeout issue for me, but my proxy gets killed by kernel 2 out of 3 times because I seem to be out of memory. This may be because I am running a devel proxy in a box, but I wonder if we should handle this somehow. The exceptions are |
|
Weird... it didn't happen to me with the file from the issue. I also run devel proxy (on my machine - not in a box...) |
|
I just re-tested in different env and it worked flawlessly. The issues I had above seem to be tied to my setup. Jenkins failures unrelated, seems like ready to merge if there are no additional comments. |
|
Merged, thanks @shlomizadok! |
No description provided.