PentHertz
/
CommonLibs
mirror of https://github.com/PentHertz/CommonLibs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use LOG(CRIT) when existing so a diagnostic message is printed to the console before exiting. 

Also clean up code slightly.
This commit is contained in:
pat.thompson 2014-03-31 12:08:20 +02:00 committed by Michael Iedema
parent 32d756c24c
commit 9cf9130509
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SelfDetect.cpp
View File

@ -30,6 +30,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
#include "UnixSignal.h"
#include "SelfDetect.h"
@ -53,11 +54,10 @@ static void sigfcn(int sig)
void SelfDetect::RegisterProgram(const char *argv0)
{
const char *p = argv0 + strlen(argv0); // point to end of string
while (p > argv0 && *p != '/') p--;
if (*p == '/') p++;
const char *p = strrchr((char*)argv0,'/');
if (p == NULL) { p = argv0; }
char buf[BUFSIZ];
char buf[100];
snprintf(buf, sizeof(buf)-1, "/var/run/%s.pid", p);
LOG(NOTICE) << "*** Registering program " << argv0 << " to " << buf;
@ -65,17 +65,15 @@ void SelfDetect::RegisterProgram(const char *argv0)
struct stat stbuf;
if (stat(buf, &stbuf) >= 0)
{
LOG(ERR) << "*** An instance of " << p << " is already running. ";
LOG(ERR) << "*** If this is not the case, deleting this file will allow " << p << " to start: " << buf;
std::cout << "*** An instance of " << p << " is already running. " << std::endl;
std::cout << "*** If this is not the case, deleting this file will allow " << p << " to start: " << buf << std::endl;
LOG(CRIT) << "*** An instance of " << p << " is already running. ";
LOG(CRIT) << "*** If this is not the case, deleting this file will allow " << p << " to start: " << buf << " exiting...";
Exit::exit(Exit::DETECTFILE);
}
FILE *fp = fopen(buf, "w");
if (fp == NULL)
{
LOG(ERR) << "*** Unable to create " << buf << ": " << strerror(errno);
LOG(CRIT) << "*** Unable to create " << buf << ": " << strerror(errno) << " exiting...";
Exit::exit(Exit::CREATEFILE);
}
fprintf(fp, "%d\n", getpid());