Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
a2d7c8c3
A
apollo
项目概览
Pinoxchio
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a2d7c8c3
编写于
12月 26, 2017
作者:
D
Dong Li
提交者:
Jiangtao Hu
12月 26, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
scripts: added support for dreamview
上级
f3d43fca
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
56 addition
and
6 deletion
+56
-6
modules/tools/supervisord/dev.conf
modules/tools/supervisord/dev.conf
+11
-0
modules/tools/supervisord/release.conf
modules/tools/supervisord/release.conf
+11
-0
scripts/bootstrap.sh
scripts/bootstrap.sh
+2
-5
scripts/dreamview_sim_control.sh
scripts/dreamview_sim_control.sh
+32
-1
未找到文件。
modules/tools/supervisord/dev.conf
浏览文件 @
a2d7c8c3
...
...
@@ -115,6 +115,17 @@ autorestart=unexpected
redirect_stderr
=
true
stdout_logfile
=/
apollo
/
data
/
log
/
dreamview
.
out
[
program
:
sim_control
]
command
=/
apollo
/
bazel
-
bin
/
modules
/
dreamview
/
dreamview
--
flagfile
=/
apollo
/
modules
/
dreamview
/
conf
/
dreamview
.
conf
--
enable_sim_control
--
log_dir
=/
apollo
/
data
/
log
autostart
=
false
numprocs
=
1
exitcodes
=
0
stopsignal
=
SIGINT
startretries
=
10
autorestart
=
unexpected
redirect_stderr
=
true
stdout_logfile
=/
apollo
/
data
/
log
/
dreamview
.
out
[
program
:
monitor
]
command
=/
apollo
/
bazel
-
bin
/
modules
/
monitor
/
monitor
--
flagfile
=/
apollo
/
modules
/
monitor
/
conf
/
monitor
.
conf
--
log_dir
=/
apollo
/
data
/
log
autostart
=
false
...
...
modules/tools/supervisord/release.conf
浏览文件 @
a2d7c8c3
...
...
@@ -115,6 +115,17 @@ autorestart=unexpected
redirect_stderr
=
true
stdout_logfile
=/
apollo
/
data
/
log
/
dreamview
.
out
[
program
:
sim_control
]
command
=/
apollo
/
modules
/
dreamview
/
dreamview
--
flagfile
=/
apollo
/
modules
/
dreamview
/
conf
/
dreamview
.
conf
--
enable_sim_control
--
log_dir
=/
apollo
/
data
/
log
autostart
=
false
numprocs
=
1
exitcodes
=
0
stopsignal
=
SIGINT
startretries
=
10
autorestart
=
unexpected
redirect_stderr
=
true
stdout_logfile
=/
apollo
/
data
/
log
/
dreamview
.
out
[
program
:
monitor
]
command
=/
apollo
/
modules
/
monitor
/
monitor
--
flagfile
=/
apollo
/
modules
/
monitor
/
conf
/
monitor
.
conf
--
log_dir
=/
apollo
/
data
/
log
autostart
=
false
...
...
scripts/bootstrap.sh
浏览文件 @
a2d7c8c3
...
...
@@ -30,22 +30,19 @@ function start() {
supervisord
-c
/apollo/modules/tools/supervisord/release.conf
>
& /tmp/supervisord.start.log
echo
"Started supervisord with release conf"
supervisorctl start monitor
>
/dev/null
supervisorctl start dreamview
>
/dev/null
else
supervisord
-c
/apollo/modules/tools/supervisord/dev.conf
>
& /tmp/supervisord.start.log
echo
"Started supervisord with dev conf"
bash scripts/dreamview.sh
fi
supervisorctl start dreamview
>
/dev/null
echo
"Dreamview is running at http://localhost:8888"
}
function
stop
()
{
if
[
"
$HOSTNAME
"
==
"in_release_docker"
]
;
then
supervisorctl stop monitor
>
/dev/null 2>&1 &
supervisorctl stop dreamview
>
/dev/null 2>&1 &
else
bash scripts/dreamview.sh stop
fi
supervisorctl stop dreamview
pkill
-f
roscore
}
...
...
scripts/dreamview_sim_control.sh
浏览文件 @
a2d7c8c3
...
...
@@ -25,4 +25,35 @@ source "${DIR}/apollo_base.sh"
# run function from apollo_base.sh
# run command_name module_name
run dreamview
"
$@
"
--enable_sim_control
=
true
function
start
()
{
echo
"Start roscore..."
ROSCORELOG
=
"
${
APOLLO_ROOT_DIR
}
/data/log/roscore.out"
nohup
roscore </dev/null
>
"
${
ROSCORELOG
}
"
2>&1 &
if
[
"
$HOSTNAME
"
==
"in_release_docker"
]
;
then
supervisord
-c
/apollo/modules/tools/supervisord/release.conf
>
& /tmp/supervisord.start.log
echo
"Started supervisord with release conf"
else
supervisord
-c
/apollo/modules/tools/supervisord/dev.conf
>
& /tmp/supervisord.start.log
echo
"Started supervisord with dev conf"
fi
supervisorctl start sim_control
>
/dev/null
echo
"Dreamview is running at http://localhost:8888"
}
function
stop
()
{
supervisorctl stop sim_control
>
/dev/null 2>&1 &
pkill
-f
roscore
}
case
$1
in
start
)
start
;;
stop
)
stop
;;
*
)
start
;;
esac
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录