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
cf0342a4
Commit
cf0342a4
authored
May 26, 2015
by
arpitgupta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix the java home checks
parent
247a4d09
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
metadata_config.py
src/bin/metadata_config.py
+6
-4
metadata_start.py
src/bin/metadata_start.py
+2
-0
metadata_stop.py
src/bin/metadata_stop.py
+2
-0
No files found.
src/bin/metadata_config.py
View file @
cf0342a4
...
@@ -110,8 +110,9 @@ def executeEnvSh(confDir):
...
@@ -110,8 +110,9 @@ def executeEnvSh(confDir):
proc
.
communicate
()
proc
.
communicate
()
def
java
(
classname
,
args
,
classpath
,
jvm_opts_list
,
logdir
=
None
):
def
java
(
classname
,
args
,
classpath
,
jvm_opts_list
,
logdir
=
None
):
if
os
.
environ
.
get
(
"JAVA_HOME"
)
is
not
None
and
os
.
environ
[
"JAVA_HOME"
]:
java_home
=
os
.
environ
.
get
(
"JAVA_HOME"
,
None
)
prg
=
os
.
path
.
join
(
os
.
environ
[
"JAVA_HOME"
],
"bin"
,
"java"
)
if
java_home
:
prg
=
os
.
path
.
join
(
java_home
,
"bin"
,
"java"
)
else
:
else
:
prg
=
which
(
"java"
)
prg
=
which
(
"java"
)
...
@@ -124,8 +125,9 @@ def java(classname, args, classpath, jvm_opts_list, logdir=None):
...
@@ -124,8 +125,9 @@ def java(classname, args, classpath, jvm_opts_list, logdir=None):
return
runProcess
(
commandline
,
logdir
)
return
runProcess
(
commandline
,
logdir
)
def
jar
(
path
):
def
jar
(
path
):
if
os
.
environ
[
"JAVA_HOME"
]
is
not
None
and
os
.
environ
[
"JAVA_HOME"
]:
java_home
=
os
.
environ
.
get
(
"JAVA_HOME"
,
None
)
prg
=
os
.
path
.
join
(
os
.
environ
[
"JAVA_HOME"
],
"bin"
,
"jar"
)
if
java_home
:
prg
=
os
.
path
.
join
(
java_home
,
"bin"
,
"jar"
)
else
:
else
:
prg
=
which
(
"jar"
)
prg
=
which
(
"jar"
)
...
...
src/bin/metadata_start.py
View file @
cf0342a4
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
# limitations under the License.
# limitations under the License.
import
os
import
os
import
sys
import
sys
import
traceback
import
metadata_config
as
mc
import
metadata_config
as
mc
...
@@ -74,6 +75,7 @@ if __name__ == '__main__':
...
@@ -74,6 +75,7 @@ if __name__ == '__main__':
returncode
=
main
()
returncode
=
main
()
except
Exception
as
e
:
except
Exception
as
e
:
print
"Exception:
%
s "
%
str
(
e
)
print
"Exception:
%
s "
%
str
(
e
)
print
traceback
.
format_exc
()
returncode
=
-
1
returncode
=
-
1
sys
.
exit
(
returncode
)
sys
.
exit
(
returncode
)
src/bin/metadata_stop.py
View file @
cf0342a4
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
import
os
import
os
from
signal
import
SIGTERM
from
signal
import
SIGTERM
import
sys
import
sys
import
traceback
import
metadata_config
as
mc
import
metadata_config
as
mc
...
@@ -52,6 +53,7 @@ if __name__ == '__main__':
...
@@ -52,6 +53,7 @@ if __name__ == '__main__':
returncode
=
main
()
returncode
=
main
()
except
Exception
as
e
:
except
Exception
as
e
:
print
"Exception:
%
s "
%
str
(
e
)
print
"Exception:
%
s "
%
str
(
e
)
print
traceback
.
format_exc
()
returncode
=
-
1
returncode
=
-
1
sys
.
exit
(
returncode
)
sys
.
exit
(
returncode
)
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