Changeset: 70f69e0e87c8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/70f69e0e87c8
Modified Files:
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/multiplex-funnel.c
Branch: Jan2022
Log Message:
A little cleanup.
diffs (50 lines):
diff --git a/tools/merovingian/daemon/handlers.c
b/tools/merovingian/daemon/handlers.c
--- a/tools/merovingian/daemon/handlers.c
+++ b/tools/merovingian/daemon/handlers.c
@@ -293,7 +293,7 @@ childhandler(void)
while (p != NULL) {
if (p->pid == pid) {
/* log everything that's still in the pipes */
- logFD(p, 0, "MSG", p->dbname, (long long
int)p->pid, _mero_logfile, 1);
+ logFD(p, 0, "MSG", p->dbname, (long long
int)p->pid, _mero_logfile, true);
p->pid = -1; /* indicate the process is dead
*/
/* close the descriptors */
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -302,18 +302,18 @@ logListener(void *x)
for (int i = 0; i < nfds; i++) {
if (pfd[i].fd == w->input[0].fd &&
pfd[i].revents & POLLIN)
logFD(w, 0, "MSG", w->dbname,
- (long long
int)w->pid, _mero_logfile, 0);
+ (long long
int)w->pid, _mero_logfile, false);
else if (pfd[i].fd == w->input[1].fd &&
pfd[i].revents & POLLIN)
logFD(w, 1, "ERR", w->dbname,
- (long long
int)w->pid, _mero_logfile, 0);
+ (long long
int)w->pid, _mero_logfile, false);
}
#else
if (FD_ISSET(w->input[0].fd, &readfds) != 0)
logFD(w, 0, "MSG", w->dbname,
- (long long int)w->pid,
_mero_logfile, 0);
+ (long long int)w->pid,
_mero_logfile, false);
if (w->input[1].fd != w->input[0].fd &&
FD_ISSET(w->input[1].fd, &readfds) != 0)
logFD(w, 1, "ERR", w->dbname,
- (long long int)w->pid,
_mero_logfile, 0);
+ (long long int)w->pid,
_mero_logfile, false);
#endif
w->flag &= ~1;
}
diff --git a/tools/merovingian/daemon/multiplex-funnel.c
b/tools/merovingian/daemon/multiplex-funnel.c
--- a/tools/merovingian/daemon/multiplex-funnel.c
+++ b/tools/merovingian/daemon/multiplex-funnel.c
@@ -866,7 +866,7 @@ multiplexThread(void *d)
while (p != NULL) {
if (p->type == MEROFUN && strcmp(p->dbname, m->name) == 0) {
/* log everything that's still in the pipes */
- logFD(p, 0, "MSG", p->dbname, (long long int)p->pid,
_mero_logfile, 1);
+ logFD(p, 0, "MSG", p->dbname, (long long int)p->pid,
_mero_logfile, true);
/* remove from the list */
q->next = p->next;
/* close the descriptors */
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
