Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
17
Merge Requests
17
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
31dff4c1
Commit
31dff4c1
authored
Jun 04, 2019
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos node format: timeout if we can't get our public IPv4
parent
16064cd6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
slapos/format.py
slapos/format.py
+1
-1
No files found.
slapos/format.py
View file @
31dff4c1
...
@@ -143,7 +143,7 @@ def getPublicIPv4Address():
...
@@ -143,7 +143,7 @@ def getPublicIPv4Address():
if
ipv4
is
not
None
:
if
ipv4
is
not
None
:
previous
=
ipv4
previous
=
ipv4
try
:
try
:
ipv4
=
json
.
load
(
urlopen
(
test
[
"url"
]))[
test
[
"json_key"
]]
ipv4
=
json
.
load
(
urlopen
(
test
[
"url"
]
,
timeout
=
15
))[
test
[
"json_key"
]]
except
:
except
:
ipv4
=
None
ipv4
=
None
if
ipv4
is
not
None
and
ipv4
==
previous
:
if
ipv4
is
not
None
and
ipv4
==
previous
:
...
...
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