void init() {
std::cout << "Running init()" << std::endl;
+ std::cerr << "(stderr)" << std::endl;
}
void run() {
std::cout << "Running run()" << std::endl;
- delay(1500);
+ delay(2000);
}
};
- int myMain(int argc, char ** argv)
+ int myMain(int argc, char const ** argv)
{
MyDaemon instance;
return instance.start(argc, argv);
::kill(::getpid(), SIGABRT);
};
- int run(int argc, char ** argv)
+ int run(int argc, char const ** argv)
{
pid = ::fork();
if (pid < 0) throw senf::SystemException("::fork()");
if (pid == 0) {
signal(SIGABRT, &backtrace);
+ signal(SIGCHLD, SIG_IGN);
try {
::_exit(myMain(argc, argv));
} catch (std::exception & ex) {
}
::_exit(125);
}
+ signal(SIGCHLD, SIG_DFL);
int status;
if (::waitpid(pid, &status, 0) < 0)
throw senf::SystemException("::waitpid()");
"--console-log=testDaemon.log",
"--pid-file=testDaemon.pid" };
- BOOST_CHECK_EQUAL( run(sizeof(args)/sizeof(*args), const_cast<char **>(args)), 0 );
+ SENF_CHECK_NO_THROW( BOOST_CHECK_EQUAL( run(sizeof(args)/sizeof(*args), args), 0 ) );
BOOST_CHECK( ! boost::filesystem::exists("invalid.log") );
BOOST_CHECK( ! boost::filesystem::exists("invalid.pid") );
::kill(pid, SIGHUP);
}
- delay(1000);
+ delay(2000);
BOOST_CHECK( ! boost::filesystem::exists("testDaemon.pid") );
BOOST_CHECK( boost::filesystem::exists("testDaemon.log") );
BOOST_CHECK( boost::filesystem::exists("testDaemon.log.1") );
std::ifstream log ("testDaemon.log.1");
std::stringstream data;
data << log.rdbuf();
- BOOST_CHECK_EQUAL( data.str(), "Running init()\nRunning run()\n" );
+ BOOST_CHECK_EQUAL( data.str(), "Running init()\n(stderr)\nRunning run()\n" );
BOOST_CHECK_NO_THROW( boost::filesystem::remove("testDaemon.log") );
BOOST_CHECK_NO_THROW( boost::filesystem::remove("testDaemon.log.1") );
}