Skip to content

Remove try/catch for correct coredump file #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stcheng merged 2 commits into from
Jun 5, 2019
Merged

Remove try/catch for correct coredump file #790

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
193669c
Remove try/catch for correct coredump file
jipanyang Feb 15, 2019
f8d31b6
Remove extra bracket and fix the indentation
jipanyang Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 12 additions & 23 deletions orchagent/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,33 +275,22 @@ int main(int argc, char **argv)

auto orchDaemon = make_shared<OrchDaemon>(&appl_db, &config_db, &state_db);

try
Copy link
Copy Markdown
Contributor

@stcheng stcheng Jun 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you also remove the try bracket and the extra indentation as well?

if (!orchDaemon->init())
{
if (!orchDaemon->init())
{
SWSS_LOG_ERROR("Failed to initialize orchstration daemon");
exit(EXIT_FAILURE);
}

/*
* In syncd view comparison solution, apply view has been sent
* immediately after restore is done
*/
if (!WarmStart::isWarmStart())
{
syncd_apply_view();
}

orchDaemon->start();
}
catch (char const *e)
{
SWSS_LOG_ERROR("Exception: %s", e);
SWSS_LOG_ERROR("Failed to initialize orchstration daemon");
exit(EXIT_FAILURE);
}
catch (exception& e)

/*
* In syncd view comparison solution, apply view has been sent
* immediately after restore is done
*/
if (!WarmStart::isWarmStart())
{
SWSS_LOG_ERROR("Failed due to exception: %s", e.what());
syncd_apply_view();
}

orchDaemon->start();

return 0;
}