Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
ef300f15
Commit
ef300f15
authored
7 years ago
by
Richard Ding
Committed by
Sarath Subramanian
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2087: Fix Unit test failures introduced by previous commit
Signed-off-by:
Sarath Subramanian
<
ssubramanian@hortonworks.com
>
parent
68f66e92
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
atlas_config.py
distro/src/bin/atlas_config.py
+12
-1
SecureEmbeddedServer.java
...va/org/apache/atlas/web/service/SecureEmbeddedServer.java
+2
-1
No files found.
distro/src/bin/atlas_config.py
View file @
ef300f15
...
...
@@ -71,6 +71,8 @@ ATLAS_HTTPS_PORT="atlas.server.https.port"
DEFAULT_ATLAS_HTTP_PORT
=
"21000"
DEFAULT_ATLAS_HTTPS_PORT
=
"21443"
ATLAS_ENABLE_TLS
=
"atlas.enableTLS"
ATLAS_SERVER_BIND_ADDRESS
=
"atlas.server.bind.address"
DEFAULT_ATLAS_SERVER_HOST
=
"localhost"
DEBUG
=
False
...
...
@@ -464,14 +466,23 @@ def get_atlas_url_port(confdir):
print
"starting atlas on port
%
s"
%
port
return
port
def
get_atlas_url_host
(
confdir
):
confdir
=
os
.
path
.
join
(
confdir
,
CONF_FILE
)
host
=
getConfigWithDefault
(
confdir
,
ATLAS_SERVER_BIND_ADDRESS
,
DEFAULT_ATLAS_SERVER_HOST
)
if
(
host
==
'0.0.0.0'
):
host
=
DEFAULT_ATLAS_SERVER_HOST
print
"starting atlas on host
%
s"
%
host
return
host
def
wait_for_startup
(
confdir
,
wait
):
count
=
0
host
=
get_atlas_url_host
(
confdir
)
port
=
get_atlas_url_port
(
confdir
)
while
True
:
try
:
s
=
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_STREAM
)
s
.
settimeout
(
1
)
s
.
connect
((
'localhost'
,
int
(
port
)))
s
.
connect
((
host
,
int
(
port
)))
s
.
close
()
break
except
Exception
as
e
:
...
...
This diff is collapsed.
Click to expand it.
webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java
View file @
ef300f15
...
...
@@ -64,7 +64,8 @@ public class SecureEmbeddedServer extends EmbeddedServer {
super
(
host
,
port
,
path
);
}
protected
Connector
getConnector
(
int
port
)
throws
IOException
{
@Override
protected
Connector
getConnector
(
String
host
,
int
port
)
throws
IOException
{
org
.
apache
.
commons
.
configuration
.
Configuration
config
=
getConfiguration
();
SslContextFactory
sslContextFactory
=
new
SslContextFactory
();
...
...
This diff is collapsed.
Click to expand it.
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