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

Return proper exit code in spectrum2_manager when instance starts

Browse source
This commit is contained in:
HanzZ 2012-09-11 09:13:18 +02:00
parent 796d8f3bf4
commit 8dfcbc8772
4 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
spectrum/src/main.cpp
View file

@ -315,7 +315,6 @@ int main(int argc, char **argv)
}
#endif
Logging::initMainLogging(&config);
#ifndef WIN32
if (!CONFIG_STRING(&config, "service.group").empty() ||!CONFIG_STRING(&config, "service.user").empty() ) {
@ -373,11 +372,15 @@ int main(int argc, char **argv)
return -2;
}
}
else if (!storageBackend->connect()) {
else if (!storageBackend->connect()) {
std::cerr << "Can't connect to database. Check the log to find out the reason.\n";
return -1;
}
// Logging has to be initialized after all std:cerr output here, because
// it forwards std::cerr to log file.
Logging::initMainLogging(&config);
UserManager userManager(&transport, &userRegistry, storageBackend);
userManager_ = &userManager;

5
spectrum_manager/src/main.cpp
View file

@ -126,7 +126,7 @@ int main(int argc, char **argv)
}
if (command[0] == "start") {
start_instances(&config);
return start_instances(&config);
}
else if (command[0] == "stop") {
stop_instances(&config);
@ -155,8 +155,7 @@ int main(int argc, char **argv)
std::string cmd = boost::algorithm::join(command, " ");
if (cmd == "start") {
start_instances(&config, jid);
return 0;
return start_instances(&config, jid);
}
else if (cmd == "stop") {
stop_instances(&config, jid);

22
spectrum_manager/src/methods.cpp
View file

@ -72,7 +72,7 @@ std::string searchForBinary(const std::string &binary) {
}
// Executes new backend
unsigned long exec_(std::string path, std::string config, std::string jid) {
unsigned long exec_(std::string path, std::string config, std::string jid, int &rc) {
// fork and exec
pid_t pid = fork();
if ( pid == 0 ) {
@ -87,7 +87,7 @@ unsigned long exec_(std::string path, std::string config, std::string jid) {
// fork failed
}
else {
waitpid(pid, 0, 0);
waitpid(pid, &rc, 0);
}
return (unsigned long) pid;
@ -128,25 +128,26 @@ int isRunning(const std::string &pidfile) {
return boost::lexical_cast<int>(pid);
}
void start_instances(ManagerConfig *config, const std::string &_jid) {
int start_instances(ManagerConfig *config, const std::string &_jid) {
int rv = 0;
response = "";
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);
return 6;
}
if (!is_directory(p)) {
std::cerr << "Config directory " << CONFIG_STRING(config, "service.config_directory") << " does not exist\n";
exit(7);
return 7;
}
std::string spectrum2_binary = searchForBinary("spectrum2");
if (spectrum2_binary.empty()) {
std::cerr << "spectrum2 binary not found in PATH\n";
exit(8);
return 8;
}
directory_iterator end_itr;
@ -177,9 +178,13 @@ void start_instances(ManagerConfig *config, const std::string &_jid) {
int pid = isRunning(CONFIG_STRING(&vhostCfg, "service.pidfile"));
if (pid == 0) {
int rc;
response = "Starting " + itr->path().string() + ": OK\n";
std::cout << "Starting " << itr->path() << ": OK\n";
exec_(spectrum2_binary, itr->path().string(), vhost);
exec_(spectrum2_binary, itr->path().string(), vhost, rc);
if (rv == 0) {
rv = rc;
}
}
else {
response = "Starting " + itr->path().string() + ": Already started (PID=" + boost::lexical_cast<std::string>(pid) + ")\n";
@ -191,8 +196,9 @@ void start_instances(ManagerConfig *config, const std::string &_jid) {
}
catch (const filesystem_error& ex) {
std::cerr << "boost filesystem error\n";
exit(5);
return 6;
}
return rv;
}
void stop_instances(ManagerConfig *config, const std::string &_jid) {

2
spectrum_manager/src/methods.h
View file

@ -44,7 +44,7 @@ unsigned long exec_(std::string path, std::string config, std::string jid = "");
int getPort(const std::string &portfile);
int isRunning(const std::string &pidfile);
void start_instances(ManagerConfig *config, const std::string &_jid = "");
int start_instances(ManagerConfig *config, const std::string &_jid = "");
void stop_instances(ManagerConfig *config, const std::string &_jid = "");
int show_status(ManagerConfig *config);