smirky/rmps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed log_trace() to log()

Browse Source
This commit is contained in:
Bogomil Vasilev
2016-08-10 20:21:54 +03:00
parent 65b923cba8
commit dcd7a46d0a
10 changed files with 100 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main.c
View File

@@ -5,12 +5,12 @@
#include <signal.h>
#include <unistd.h>
#include "confparser.h"
#include "log_trace.h"
#include "log.h"
#include "rmps.h"
static void usage(char *argv)
{
log_trace( ERROR,
log( ERROR,
"Usage:\n%s start|stop|restart [--daemonize=yes|no]\n",
argv );
}
@@ -45,10 +45,10 @@ int main(int argc, char *argv[])
}
}
if (confparse() != 0) {
log_trace(ERROR, "Failed to parse the conf!");
log(ERROR, "Failed to parse the conf!");
exit(EXIT_FAILURE);
}
log_trace(VERBOSE, "Conf parser finished successfully");
log(VERBOSE, "Conf parser finished successfully");
//confexport();
if (task == 2 || task == 3) {
@@ -56,16 +56,16 @@ int main(int argc, char *argv[])
int pid;
FILE *fp;
if (task == 2)
log_trace(VERBOSE, "We got a stop signal!");
log(VERBOSE, "We got a stop signal!");
else if (task == 3)
log_trace(VERBOSE, "We got a restart signal!");
log(VERBOSE, "We got a restart signal!");
fp = fopen(conf.rmps.pidfile, "r");
switch (errno) {
case EEXIST:
if (!fgets(buf, 10, fp)) {
log_trace(ERROR, "Failed to read %s!", conf.rmps.pidfile);
log(ERROR, "Failed to read %s!", conf.rmps.pidfile);
exit(EXIT_FAILURE);
}
pid = strtol(buf, NULL, 10);
@@ -73,14 +73,14 @@ int main(int argc, char *argv[])
//waitpid(TODO);
break;
case EACCES:
log_trace(ERROR, "Permission denied to read PID. Exiting!");
log(ERROR, "Permission denied to read PID. Exiting!");
exit(EXIT_FAILURE);
case ENOENT:
if (task == 2)
exit(EXIT_FAILURE);
break;
default:
log_trace( ERROR,
log( ERROR,
"Unhandled errno while opening PID: %d. Exiting!",
errno
);