jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

* #18944: daemon: fix tests, print message to stderr if pidfile creation fails

Browse Source
This commit is contained in:
Tristan Matthews
2013-01-23 14:22:49 -05:00
parent 798b93760e
commit 661de6a5b6
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/src/main.cpp
View File

@ -150,8 +150,11 @@ int main(int argc, char *argv [])
return 0;
fileutils::FileHandle f(fileutils::create_pidfile());
if (f.fd == -1)
if (f.fd == -1) {
std::cerr << "An " PACKAGE_NAME <<
" instance is already running, quitting..." << std::endl;
return 1;
}
try {
Manager::instance().init("");

5
daemon/test/main.cpp
View File

@ -65,8 +65,11 @@ int main(int argc, char* argv[])
printf("\nSFLphone Daemon Test Suite, by Savoir-Faire Linux 2004-2010\n\n");
Logger::setConsoleLog(true);
Logger::setDebugMode(true);
if (!fileutils::create_pidfile())
fileutils::FileHandle f(fileutils::create_pidfile());
if (f.fd == -1) {
fprintf(stderr, "An sflphoned instance is already running, quitting...\n");
return 1;
}
int argvIndex = 1;
bool xmlOutput = false;