Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
月轩居士
SkyWalking
提交
f44ed756
S
SkyWalking
项目概览
月轩居士
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
f44ed756
编写于
2月 04, 2021
作者:
跬步至以千里
提交者:
GitHub
2月 04, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow user-defined `JAVA_OPTS` in the startup script (#6316)
上级
d12d3f20
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
23 deletion
+18
-23
CHANGES.md
CHANGES.md
+2
-3
dist-material/bin/oapService.sh
dist-material/bin/oapService.sh
+4
-5
dist-material/bin/oapServiceInit.sh
dist-material/bin/oapServiceInit.sh
+4
-5
dist-material/bin/oapServiceNoInit.sh
dist-material/bin/oapServiceNoInit.sh
+4
-5
dist-material/bin/webappService.sh
dist-material/bin/webappService.sh
+4
-5
未找到文件。
CHANGES.md
浏览文件 @
f44ed756
...
...
@@ -9,12 +9,11 @@ Release Notes.
#### Java Agent
*
Remove invalid mysql configuration in agent.config.
*
Add net.bytebuddy.agent.builder.AgentBuilder.RedefinitionStrategy.Listener
to show detail message when redifine errors occur
*
Add net.bytebuddy.agent.builder.AgentBuilder.RedefinitionStrategy.Listener to show detail message when redifine errors occur
#### OAP-Backend
*
Allow user-defined
`JAVA_OPTS`
in the startup script.
#### UI
...
...
dist-material/bin/oapService.sh
浏览文件 @
f44ed756
#!/usr/bin/env sh
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
...
...
@@ -14,14 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#!/usr/bin/env sh
PRG
=
"
$0
"
PRGDIR
=
`
dirname
"
$PRG
"
`
[
-z
"
$OAP_HOME
"
]
&&
OAP_HOME
=
`
cd
"
$PRGDIR
/.."
>
/dev/null
;
pwd
`
PRGDIR
=
$(
dirname
"
$PRG
"
)
[
-z
"
$OAP_HOME
"
]
&&
OAP_HOME
=
$(
cd
"
$PRGDIR
/.."
>
/dev/null
||
exit
1
;
pwd
)
OAP_LOG_DIR
=
"
${
OAP_LOG_DIR
:-${
OAP_HOME
}
/logs
}
"
JAVA_OPTS
=
"
-Xms256M -Xmx512M
"
JAVA_OPTS
=
"
${
JAVA_OPTS
:-
-Xms256M -Xmx512M
}
"
if
[
!
-d
"
${
OAP_LOG_DIR
}
"
]
;
then
mkdir
-p
"
${
OAP_LOG_DIR
}
"
...
...
dist-material/bin/oapServiceInit.sh
浏览文件 @
f44ed756
#!/usr/bin/env sh
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
...
...
@@ -14,14 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#!/usr/bin/env sh
PRG
=
"
$0
"
PRGDIR
=
`
dirname
"
$PRG
"
`
[
-z
"
$OAP_HOME
"
]
&&
OAP_HOME
=
`
cd
"
$PRGDIR
/.."
>
/dev/null
;
pwd
`
PRGDIR
=
$(
dirname
"
$PRG
"
)
[
-z
"
$OAP_HOME
"
]
&&
OAP_HOME
=
$(
cd
"
$PRGDIR
/.."
>
/dev/null
||
exit
1
;
pwd
)
OAP_LOG_DIR
=
"
${
OAP_HOME
}
/logs"
JAVA_OPTS
=
"
-Xms256M -Xmx512M
"
JAVA_OPTS
=
"
${
JAVA_OPTS
:-
-Xms256M -Xmx512M
}
"
if
[
!
-d
"
${
OAP_HOME
}
/logs"
]
;
then
mkdir
-p
"
${
OAP_LOG_DIR
}
"
...
...
dist-material/bin/oapServiceNoInit.sh
浏览文件 @
f44ed756
#!/usr/bin/env sh
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
...
...
@@ -14,14 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#!/usr/bin/env sh
PRG
=
"
$0
"
PRGDIR
=
`
dirname
"
$PRG
"
`
[
-z
"
$OAP_HOME
"
]
&&
OAP_HOME
=
`
cd
"
$PRGDIR
/.."
>
/dev/null
;
pwd
`
PRGDIR
=
$(
dirname
"
$PRG
"
)
[
-z
"
$OAP_HOME
"
]
&&
OAP_HOME
=
$(
cd
"
$PRGDIR
/.."
>
/dev/null
||
exit
1
;
pwd
)
OAP_LOG_DIR
=
${
OAP_LOG_DIR
:-
"
${
OAP_HOME
}
/logs"
}
JAVA_OPTS
=
"
-Xms256M -Xmx512M
"
JAVA_OPTS
=
"
${
JAVA_OPTS
:-
-Xms256M -Xmx512M
}
"
if
[
!
-d
"
${
OAP_HOME
}
/logs"
]
;
then
mkdir
-p
"
${
OAP_LOG_DIR
}
"
...
...
dist-material/bin/webappService.sh
浏览文件 @
f44ed756
#!/usr/bin/env sh
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
...
...
@@ -14,14 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#!/usr/bin/env sh
PRG
=
"
$0
"
PRGDIR
=
`
dirname
"
$PRG
"
`
[
-z
"
$WEBAPP_HOME
"
]
&&
WEBAPP_HOME
=
`
cd
"
$PRGDIR
/.."
>
/dev/null
;
pwd
`
PRGDIR
=
$(
dirname
"
$PRG
"
)
[
-z
"
$WEBAPP_HOME
"
]
&&
WEBAPP_HOME
=
$(
cd
"
$PRGDIR
/.."
>
/dev/null
||
exit
1
;
pwd
)
WEBAPP_LOG_DIR
=
"
${
WEBAPP_LOG_DIR
:-${
WEBAPP_HOME
}
/logs
}
"
JAVA_OPTS
=
"
-Xms256M -Xmx512M
"
JAVA_OPTS
=
"
${
JAVA_OPTS
:-
-Xms256M -Xmx512M
}
"
JAR_PATH
=
"
${
WEBAPP_HOME
}
/webapp"
if
[
!
-d
"
${
WEBAPP_LOG_DIR
}
"
]
;
then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录