// $Id$
//
-// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer NETwork research (NET)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
}
};
- int myMain(int argc, char const ** argv)
+ int myMain(int argc, char ** argv)
{
MyDaemon instance;
return instance.start(argc, argv);
}
- int run(int argc, char const ** argv)
+ int pid;
+
+ int run(int argc, char ** argv)
{
- int pid (::fork());
- if (pid < 0) senf::throwErrno("::fork()");
+ pid = ::fork();
+ if (pid < 0) throw senf::SystemException("::fork()");
if (pid == 0) {
- ::_exit(myMain(argc, argv));
+ try {
+ ::_exit(myMain(argc, argv));
+ } catch (std::exception & ex) {
+ std::cerr << "Unexpected exception: " << ex.what() << std::endl;
+ } catch (...) {
+ std::cerr << "Unexpected exception" << std::endl;
+ }
+ ::_exit(2);
}
int status;
- if (::waitpid(pid, &status, 0) < 0) senf::throwErrno("::waitpid()");
+ if (::waitpid(pid, &status, 0) < 0) throw senf::SystemException("::waitpid()");
return WIFEXITED(status) ? WEXITSTATUS(status) : -1;
}
BOOST_AUTO_UNIT_TEST(testDaemon)
{
- char const * args[] = { "run",
- "--console-log=testDaemon.log,none",
- "--pid-file=testDaemon.pid" };
+ char * args[] = { "run",
+ "--console-log=testDaemon.log,none",
+ "--pid-file=testDaemon.pid" };
BOOST_CHECK_EQUAL( run(sizeof(args)/sizeof(*args),args), 0 );
BOOST_CHECK( ! boost::filesystem::exists("invalid.log") );
BOOST_CHECK( ! boost::filesystem::exists("invalid.pid") );
- BOOST_CHECK( boost::filesystem::exists("testDaemon.pid") );
+ BOOST_REQUIRE( boost::filesystem::exists("testDaemon.pid") );
+ BOOST_REQUIRE( boost::filesystem::exists("testDaemon.log") );
+
+ boost::filesystem::rename("testDaemon.log", "testDaemon.log.1");
+ {
+ std::ifstream pidFile ("testDaemon.pid");
+ int pid (0);
+ BOOST_REQUIRE( pidFile >> pid );
+ BOOST_REQUIRE( pid != 0 );
+ ::kill(pid, SIGHUP);
+ }
+
delay(1000);
BOOST_CHECK( ! boost::filesystem::exists("testDaemon.pid") );
- BOOST_REQUIRE( boost::filesystem::exists("testDaemon.log") );
+ BOOST_CHECK( boost::filesystem::exists("testDaemon.log") );
+ BOOST_REQUIRE( boost::filesystem::exists("testDaemon.log.1") );
- std::ifstream log ("testDaemon.log");
+ std::ifstream log ("testDaemon.log.1");
std::stringstream data;
data << log.rdbuf();
BOOST_CHECK_EQUAL( data.str(), "Running init()\nRunning run()\n" );
BOOST_CHECK_NO_THROW( boost::filesystem::remove("testDaemon.log") );
+ BOOST_CHECK_NO_THROW( boost::filesystem::remove("testDaemon.log.1") );
}
///////////////////////////////cc.e////////////////////////////////////////