Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos
Commits
181cffc2
Commit
181cffc2
authored
May 27, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add timeout to curl that is not otherwise killed by slapos promise subsystem.
parent
248e6a26
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
slapos/recipe/check_page_content/template/check_page_content.in
.../recipe/check_page_content/template/check_page_content.in
+1
-1
slapos/recipe/check_url_available/template/check_url.in
slapos/recipe/check_url_available/template/check_url.in
+1
-1
No files found.
slapos/recipe/check_page_content/template/check_page_content.in
View file @
181cffc2
...
@@ -10,7 +10,7 @@ if [ -z $URL ]; then
...
@@ -10,7 +10,7 @@ if [ -z $URL ]; then
exit 3
exit 3
fi
fi
%(curl_path)s -k -sL $URL | grep "$MATCH" > /dev/null
%(curl_path)s -k -sL $URL
--max-time 10
| grep "$MATCH" > /dev/null
if [ $? != 0 ]; then
if [ $? != 0 ]; then
echo "Content at $URL seems to be corrupted" >&2
echo "Content at $URL seems to be corrupted" >&2
...
...
slapos/recipe/check_url_available/template/check_url.in
View file @
181cffc2
...
@@ -9,7 +9,7 @@ if [ -z $URL ]; then
...
@@ -9,7 +9,7 @@ if [ -z $URL ]; then
exit 3
exit 3
fi
fi
CODE=$(%(curl_path)s -g -k -sL $URL -w %%{http_code} -o /dev/null)
CODE=$(%(curl_path)s -g -k -sL $URL -w %%{http_code} -
-max-time 10 -
o /dev/null)
if [ $? -eq 3 ]; then
if [ $? -eq 3 ]; then
echo "URL malformed: $URL." >&2
echo "URL malformed: $URL." >&2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment