d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make workers inherit debug level from the main process.

Browse Source 
Approved by:	pjd (mentor)
MFC after:	1 week
This commit is contained in:
Mikolaj Golub 2011-03-11 12:12:35 +00:00
parent 586b0ae5aa
commit bc7a916a25
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=219482
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/hastd/primary.c
View File

@ -806,7 +806,7 @@ hastd_primary(struct hast_resource *res)
{
pthread_t td;
pid_t pid;
int error, mode;
int error, mode, debuglevel;
/*
* Create communication channel for sending control commands from
@ -858,6 +858,7 @@ hastd_primary(struct hast_resource *res)
gres = res;
mode = pjdlog_mode_get();
debuglevel = pjdlog_debug_get();
/* Declare that we are sender. */
proto_send(res->hr_event, NULL, 0);
@ -869,6 +870,7 @@ hastd_primary(struct hast_resource *res)
descriptors_assert(res, mode);
pjdlog_init(mode);
pjdlog_debug_set(debuglevel);
pjdlog_prefix_set("[%s] (%s) ", res->hr_name, role2str(res->hr_role));
setproctitle("%s (primary)", res->hr_name);

4
sbin/hastd/secondary.c
View File

@ -346,7 +346,7 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin)
sigset_t mask;
pthread_t td;
pid_t pid;
int error, mode;
int error, mode, debuglevel;
/*
* Create communication channel between parent and child.
@ -398,6 +398,7 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin)
gres = res;
mode = pjdlog_mode_get();
debuglevel = pjdlog_debug_get();
/* Declare that we are sender. */
proto_send(res->hr_event, NULL, 0);
@ -409,6 +410,7 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin)
descriptors_assert(res, mode);
pjdlog_init(mode);
pjdlog_debug_set(debuglevel);
pjdlog_prefix_set("[%s] (%s) ", res->hr_name, role2str(res->hr_role));
setproctitle("%s (secondary)", res->hr_name);