Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
9e35ed04
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
9e35ed04
编写于
5月 22, 2018
作者:
Z
zorba80
提交者:
GitHub
5月 22, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into issue3189
上级
096f1af7
bbcd6518
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
7 deletion
+23
-7
plugins/chain_plugin/chain_plugin.cpp
plugins/chain_plugin/chain_plugin.cpp
+9
-3
programs/nodeos/main.cpp
programs/nodeos/main.cpp
+14
-4
未找到文件。
plugins/chain_plugin/chain_plugin.cpp
浏览文件 @
9e35ed04
...
...
@@ -526,8 +526,10 @@ fc::variant read_only::get_block(const read_only::get_block_params& params) cons
read_write
::
push_block_results
read_write
::
push_block
(
const
read_write
::
push_block_params
&
params
)
{
try
{
db
.
push_block
(
std
::
make_shared
<
signed_block
>
(
params
)
);
}
catch
(
...
)
{
}
catch
(
boost
::
interprocess
::
bad_alloc
&
)
{
raise
(
SIGUSR1
);
}
catch
(
...
)
{
throw
;
}
return
read_write
::
push_block_results
();
}
...
...
@@ -547,8 +549,10 @@ read_write::push_transaction_results read_write::push_transaction(const read_wri
pretty_output
=
db
.
to_variant_with_abi
(
*
trx_trace_ptr
);;
//abi_serializer::to_variant(*trx_trace_ptr, pretty_output, resolver);
id
=
trx_trace_ptr
->
id
;
}
catch
(
...
)
{
}
catch
(
boost
::
interprocess
::
bad_alloc
&
)
{
raise
(
SIGUSR1
);
}
catch
(
...
)
{
throw
;
}
return
read_write
::
push_transaction_results
{
id
,
pretty_output
};
}
...
...
@@ -566,8 +570,10 @@ read_write::push_transactions_results read_write::push_transactions(const read_w
fc
::
mutable_variant_object
(
"error"
,
e
.
to_detail_string
()
)
}
);
}
}
}
catch
(
...
)
{
}
catch
(
boost
::
interprocess
::
bad_alloc
&
)
{
raise
(
SIGUSR1
);
}
catch
(
...
)
{
throw
;
}
return
result
;
}
...
...
programs/nodeos/main.cpp
浏览文件 @
9e35ed04
...
...
@@ -79,6 +79,13 @@ void initialize_logging()
logging_conf_loop
();
}
enum
return_codes
{
INITIALIZE_FAIL
=
-
1
,
SUCCESS
=
0
,
BAD_ALLOC
=
1
,
OTHER_FAIL
=
2
};
int
main
(
int
argc
,
char
**
argv
)
{
try
{
...
...
@@ -89,7 +96,7 @@ int main(int argc, char** argv)
app
().
set_default_data_dir
(
root
/
"eosio/nodeos/data"
);
app
().
set_default_config_dir
(
root
/
"eosio/nodeos/config"
);
if
(
!
app
().
initialize
<
chain_plugin
,
http_plugin
,
net_plugin
,
producer_plugin
>
(
argc
,
argv
))
return
-
1
;
return
INITIALIZE_FAIL
;
initialize_logging
();
ilog
(
"nodeos version ${ver}"
,
(
"ver"
,
eosio
::
utilities
::
common
::
itoh
(
static_cast
<
uint32_t
>
(
app
().
version
()))));
ilog
(
"eosio root is ${root}"
,
(
"root"
,
root
.
string
()));
...
...
@@ -97,17 +104,20 @@ int main(int argc, char** argv)
app
().
exec
();
}
catch
(
const
fc
::
exception
&
e
)
{
elog
(
"${e}"
,
(
"e"
,
e
.
to_detail_string
()));
return
OTHER_FAIL
;
}
catch
(
const
boost
::
interprocess
::
bad_alloc
&
e
)
{
elog
(
"bad alloc"
);
//elog("${e}", ("e", boost::diagnostic_information(e)));
return
3
;
return
BAD_ALLOC
;
}
catch
(
const
boost
::
exception
&
e
)
{
elog
(
"${e}"
,
(
"e"
,
boost
::
diagnostic_information
(
e
)));
return
OTHER_FAIL
;
}
catch
(
const
std
::
exception
&
e
)
{
elog
(
"${e}"
,
(
"e"
,
e
.
what
()));
return
OTHER_FAIL
;
}
catch
(...)
{
elog
(
"unknown exception"
);
return
OTHER_FAIL
;
}
return
0
;
return
SUCCESS
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录