stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

stop all instances + maybe fix for swiften windows problem

Browse source
This commit is contained in:
HanzZ 2011-10-20 15:57:44 +02:00
parent ede361d7b8
commit 47d27ef2e1
2 changed files with 74 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake_modules/SwiftenConfig.cmake
View file

@ -8,8 +8,9 @@ if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
execute_process(
COMMAND ${SWIFTEN_CONFIG_EXECUTABLE} --libs
OUTPUT_VARIABLE SWIFTEN_LIBRARY)
string(REGEX REPLACE "[\r\n]" " " SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
string(REGEX REPLACE " +$" "" SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
string(REGEX REPLACE "[\r\n]" " " SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY})
string(REGEX REPLACE " +$" "" SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY})
string(REGEX REPLACE " " ";" SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY})
else()
message( FATAL_ERROR "Could NOT find swiften-config" )
endif()

104
spectrum_manager/src/main.cpp
View file

@ -102,10 +102,10 @@ static unsigned long exec_(std::string path, std::string config) {
return (unsigned long) pid;
}
static bool isRunning(const std::string &pidfile) {
static int isRunning(const std::string &pidfile) {
path p(pidfile);
if (!exists(p) || is_directory(p)) {
return false;
return 0;
}
std::ifstream f(p.string().c_str(), std::ios_base::in);
@ -113,52 +113,87 @@ static bool isRunning(const std::string &pidfile) {
f >> pid;
if (pid.empty())
return false;
return 0;
if (kill(boost::lexical_cast<int>(pid), 0) != 0)
return false;
return 0;
return true;
return boost::lexical_cast<int>(pid);
}
static void start_all_instances(ManagerConfig *config) {
path p(CONFIG_STRING(config, "service.config_directory"));
path p(CONFIG_STRING(config, "service.config_directory"));
try {
if (!exists(p)) {
std::cerr << "Config directory " << CONFIG_STRING(config, "service.config_directory") << " does not exist\n";
exit(6);
}
try {
if (!exists(p)) {
std::cerr << "Config directory " << CONFIG_STRING(config, "service.config_directory") << " does not exist\n";
exit(6);
}
if (!is_directory(p)) {
std::cerr << "Config directory " << CONFIG_STRING(config, "service.config_directory") << " does not exist\n";
exit(7);
}
if (!is_directory(p)) {
std::cerr << "Config directory " << CONFIG_STRING(config, "service.config_directory") << " does not exist\n";
exit(7);
}
std::string spectrum2_binary = searchForBinary("spectrum2");
if (spectrum2_binary.empty()) {
std::cerr << "spectrum2 binary not found in PATH\n";
exit(8);
}
std::string spectrum2_binary = searchForBinary("spectrum2");
if (spectrum2_binary.empty()) {
std::cerr << "spectrum2 binary not found in PATH\n";
exit(8);
}
directory_iterator end_itr;
for (directory_iterator itr(p); itr != end_itr; ++itr) {
if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
Config cfg;
if (cfg.load(itr->path().string()) == false) {
std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
}
directory_iterator end_itr;
for (directory_iterator itr(p); itr != end_itr; ++itr) {
if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
Config cfg;
if (cfg.load(itr->path().string()) == false) {
std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
}
if (!isRunning(CONFIG_STRING(&cfg, "service.pidfile"))) {
exec_(spectrum2_binary, itr->path().string());
}
if (!isRunning(CONFIG_STRING(&cfg, "service.pidfile"))) {
exec_(spectrum2_binary, itr->path().string());
}
}
}
catch (const filesystem_error& ex) {
std::cerr << "error 1\n";
exit(5);
}
catch (const filesystem_error& ex) {
std::cerr << "boost filesystem error\n";
exit(5);
}
}
static void stop_all_instances(ManagerConfig *config) {
path p(CONFIG_STRING(config, "service.config_directory"));
try {
if (!exists(p)) {
std::cerr << "Config directory " << CONFIG_STRING(config, "service.config_directory") << " does not exist\n";
exit(6);
}
if (!is_directory(p)) {
std::cerr << "Config directory " << CONFIG_STRING(config, "service.config_directory") << " does not exist\n";
exit(7);
}
directory_iterator end_itr;
for (directory_iterator itr(p); itr != end_itr; ++itr) {
if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
Config cfg;
if (cfg.load(itr->path().string()) == false) {
std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
}
int pid = isRunning(CONFIG_STRING(&cfg, "service.pidfile"));
if (pid) {
kill(pid, SIGTERM);
}
}
}
}
catch (const filesystem_error& ex) {
std::cerr << "boost filesystem error\n";
exit(5);
}
}
int main(int argc, char **argv)
@ -208,6 +243,9 @@ int main(int argc, char **argv)
if (command == "start") {
start_all_instances(&config);
}
else if (command == "stop") {
stop_all_instances(&config);
}
else {
Swift::SimpleEventLoop eventLoop;
Swift::BoostNetworkFactories networkFactories(&eventLoop);