experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Demon->Daemon, FreeBSD grep changes

Browse source
This commit is contained in:
Olof Hagsand 2019-10-14 07:47:08 -10:00
parent 734f65e25a
commit 77b491c568
15 changed files with 54 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/clixon_err.c
View file

@ -85,7 +85,7 @@ char clicon_err_reason[ERR_STRLEN] = {0, };
*/
static struct errvec EV[] = {
{"Database error", OE_DB},
{"Demon error", OE_DEMON},
{"Daemon error", OE_DAEMON},
{"Event error", OE_EVENTS},
{"Config error", OE_CFG},
{"Protocol error", OE_PROTO},

8
lib/src/clixon_sig.c
View file

@ -165,7 +165,7 @@ pidfile_zapold(pid_t pid)
if ((kill (pid, 0)) != 0 && errno == ESRCH) /* Nothing there */
;
else{ /* problem: couldnt kill it */
clicon_err(OE_DEMON, errno, "Killing old demon");
clicon_err(OE_DAEMON, errno, "Killing old demon");
return -1;
}
return 0;
@ -184,13 +184,13 @@ pidfile_write(char *pidfile)
/* Here, there should be no old agent and no pidfile */
if ((f = fopen(pidfile, "w")) == NULL){
if (errno == EACCES)
clicon_err(OE_DEMON, errno, "Creating pid-file %s (Try run as root?)", pidfile);
clicon_err(OE_DAEMON, errno, "Creating pid-file %s (Try run as root?)", pidfile);
else
clicon_err(OE_DEMON, errno, "Creating pid-file %s", pidfile);
clicon_err(OE_DAEMON, errno, "Creating pid-file %s", pidfile);
goto done;
}
if ((retval = fprintf(f, "%ld\n", (long) getpid())) < 1){
clicon_err(OE_DEMON, errno, "Could not write pid to %s", pidfile);
clicon_err(OE_DAEMON, errno, "Could not write pid to %s", pidfile);
goto done;
}
clicon_debug(1, "Opened pidfile %s with pid %d", pidfile, getpid());