Cleanup examples

This commit is contained in:
Alexey Rybalchenko
2016-05-12 09:15:35 +02:00
committed by Mohammad Al-Turany
parent edcc7a4ee3
commit 622a11a32d
18 changed files with 98 additions and 199 deletions

View File

@@ -12,27 +12,23 @@
* @author D. Klein, A. Rybalchenko
*/
#include <iostream>
#include "FairMQLogger.h"
#include "FairMQParser.h"
#include "FairMQProgOptions.h"
#include "FairMQExample2Processor.h"
int main(int argc, char** argv)
{
FairMQExample2Processor processor;
processor.CatchSignals();
FairMQProgOptions config;
try
{
FairMQProgOptions config;
if (config.ParseAll(argc, argv))
{
return 0;
}
FairMQExample2Processor processor;
processor.CatchSignals();
processor.SetConfig(config);
processor.ChangeState("INIT_DEVICE");
@@ -46,9 +42,8 @@ int main(int argc, char** argv)
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
LOG(INFO) << "Command line options are the following: ";
config.PrintHelp();
LOG(ERROR) << "Unhandled Exception reached the top of main: "
<< e.what() << ", application will now exit";
return 1;
}

View File

@@ -12,12 +12,10 @@
* @author D. Klein, A. Rybalchenko
*/
#include <iostream>
#include "boost/program_options.hpp"
#include "FairMQLogger.h"
#include "FairMQParser.h"
#include "FairMQProgOptions.h"
#include "FairMQExample2Sampler.h"
@@ -25,11 +23,6 @@ using namespace boost::program_options;
int main(int argc, char** argv)
{
FairMQExample2Sampler sampler;
sampler.CatchSignals();
FairMQProgOptions config;
try
{
std::string text;
@@ -38,13 +31,15 @@ int main(int argc, char** argv)
samplerOptions.add_options()
("text", value<std::string>(&text)->default_value("Hello"), "Text to send out");
FairMQProgOptions config;
config.AddToCmdLineOptions(samplerOptions);
if (config.ParseAll(argc, argv))
{
return 0;
}
FairMQExample2Sampler sampler;
sampler.CatchSignals();
sampler.SetConfig(config);
sampler.SetProperty(FairMQExample2Sampler::Text, text);
@@ -59,9 +54,8 @@ int main(int argc, char** argv)
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
LOG(INFO) << "Command line options are the following: ";
config.PrintHelp();
LOG(ERROR) << "Unhandled Exception reached the top of main: "
<< e.what() << ", application will now exit";
return 1;
}

View File

@@ -12,27 +12,23 @@
* @author D. Klein, A. Rybalchenko
*/
#include <iostream>
#include "FairMQLogger.h"
#include "FairMQParser.h"
#include "FairMQProgOptions.h"
#include "FairMQExample2Sink.h"
int main(int argc, char** argv)
{
FairMQExample2Sink sink;
sink.CatchSignals();
FairMQProgOptions config;
try
{
FairMQProgOptions config;
if (config.ParseAll(argc, argv))
{
return 0;
}
FairMQExample2Sink sink;
sink.CatchSignals();
sink.SetConfig(config);
sink.ChangeState("INIT_DEVICE");
@@ -46,9 +42,8 @@ int main(int argc, char** argv)
}
catch (std::exception& e)
{
LOG(ERROR) << e.what();
LOG(INFO) << "Command line options are the following: ";
config.PrintHelp();
LOG(ERROR) << "Unhandled Exception reached the top of main: "
<< e.what() << ", application will now exit";
return 1;
}