Changeset: 82088713e11a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/82088713e11a
Modified Files:
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/handlers.c
Branch: Jul2021
Log Message:
Make sure logged messages end with a newline.
diffs (142 lines):
diff --git a/tools/merovingian/daemon/connections.c
b/tools/merovingian/daemon/connections.c
--- a/tools/merovingian/daemon/connections.c
+++ b/tools/merovingian/daemon/connections.c
@@ -96,13 +96,13 @@ openConnectionIP(int *socks, bool udp, c
}
#if !defined(SOCK_CLOEXEC) && defined(HAVE_FCNTL)
if (fcntl(sock, F_SETFD, FD_CLOEXEC) < 0)
- Mfprintf(log, "fcntl FD_CLOEXEC: %s",
strerror(e));
+ Mfprintf(log, "fcntl FD_CLOEXEC: %s\n",
strerror(e));
#endif
if (rp->ai_family == AF_INET6 &&
setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
(const char *) &(int){0},
sizeof(int)) == -1)
- Mfprintf(log, "setsockopt IPV6_V6ONLY: %s",
strerror(e));
+ Mfprintf(log, "setsockopt IPV6_V6ONLY: %s\n",
strerror(e));
if (!udp) {
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
@@ -114,12 +114,12 @@ openConnectionIP(int *socks, bool udp, c
#ifdef SO_EXCLUSIVEADDRUSE
if (setsockopt(sock, SOL_SOCKET,
SO_EXCLUSIVEADDRUSE,
(const char *) &on,
sizeof on) < 0)
- Mfprintf(log, "setsockopt
SO_EXCLUSIVEADDRUSE: %s", strerror(e));
+ Mfprintf(log, "setsockopt
SO_EXCLUSIVEADDRUSE: %s\n", strerror(e));
#endif
#ifdef SO_EXCLBIND
if (setsockopt(sock, SOL_SOCKET, SO_EXCLBIND,
(const char *) &on,
sizeof on) < 0)
- Mfprintf(log, "setsockopt SO_EXCLBIND:
%s", strerror(e));
+ Mfprintf(log, "setsockopt SO_EXCLBIND:
%s\n", strerror(e));
#endif
}
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -720,7 +720,7 @@ static void ctl_handle_client(
Mfprintf(_mero_ctlout, "Start snapshot of
database '%s' to file '%s'\n", q, dest);
char *e = snapshot_database_to(q, dest);
if (e != NULL) {
- Mfprintf(_mero_ctlerr, "%s: snapshot
database '%s' to %s failed: %s",
+ Mfprintf(_mero_ctlerr, "%s: snapshot
database '%s' to %s failed: %s\n",
origin, q, dest, getErrMsg(e));
len = snprintf(buf2, sizeof(buf2),
"%s\n", getErrMsg(e));
send_client("!");
@@ -735,7 +735,7 @@ static void ctl_handle_client(
char *dest = NULL;
char *e = snapshot_default_filename(&dest, q);
if (e != NULL) {
- Mfprintf(_mero_ctlerr, "%s: snapshot
database '%s': %s",
+ Mfprintf(_mero_ctlerr, "%s: snapshot
database '%s': %s\n",
origin, q, getErrMsg(e));
len = snprintf(buf2, sizeof(buf2),
"%s\n", getErrMsg(e));
send_client("!");
@@ -744,7 +744,7 @@ static void ctl_handle_client(
Mfprintf(_mero_ctlout, "Start snapshot
of database '%s' to file '%s'\n", q, dest);
e = snapshot_database_to(q, dest);
if (e != NULL) {
- Mfprintf(_mero_ctlerr, "%s:
snapshot database '%s' to %s failed: %s",
+ Mfprintf(_mero_ctlerr, "%s:
snapshot database '%s' to %s failed: %s\n",
origin, q, dest,
getErrMsg(e));
len = snprintf(buf2,
sizeof(buf2), "%s\n", getErrMsg(e));
send_client("!");
@@ -794,7 +794,7 @@ static void ctl_handle_client(
if (wrapper)
mnstr_destroy(wrapper);
if (e != NULL) {
- Mfprintf(_mero_ctlerr, "%s: streaming
snapshot database '%s' failed: %s",
+ Mfprintf(_mero_ctlerr, "%s: streaming
snapshot database '%s' failed: %s\n",
origin, q, getErrMsg(e));
len = snprintf(buf2, sizeof(buf2),
"%s\n", getErrMsg(e));
send_client("!");
@@ -811,7 +811,7 @@ static void ctl_handle_client(
Mfprintf(_mero_ctlout, "Start restore snapshot
of database '%s' from file '%s'\n", q, source);
char *e = snapshot_restore_from(q, source);
if (e != NULL) {
- Mfprintf(_mero_ctlerr, "%s: restore
database '%s' from snapshot %s failed: %s",
+ Mfprintf(_mero_ctlerr, "%s: restore
database '%s' from snapshot %s failed: %s\n",
origin, q, source,
getErrMsg(e));
len = snprintf(buf2, sizeof(buf2),
"%s\n", getErrMsg(e));
send_client("!");
@@ -841,7 +841,7 @@ static void ctl_handle_client(
struct snapshot *snaps = NULL;
char *e = snapshot_list(&nsnaps, &snaps);
if (e != NULL) {
- Mfprintf(_mero_ctlerr, "%s: snapshot
list failed: %s", origin, getErrMsg(e));
+ Mfprintf(_mero_ctlerr, "%s: snapshot
list failed: %s\n", origin, getErrMsg(e));
len = snprintf(buf2, sizeof(buf2),
"%s\n", getErrMsg(e));
send_client("!");
freeErr(e);
@@ -1219,7 +1219,7 @@ controlRunner(void *d)
do {
if ((p = malloc(sizeof(int))) == NULL) {
- Mfprintf(_mero_ctlerr, "malloc failed");
+ Mfprintf(_mero_ctlerr, "malloc failed\n");
break;
}
/* limit waiting time in order to check whether we need to exit
*/
@@ -1265,7 +1265,7 @@ controlRunner(void *d)
case ENOBUFS:
case ENOMEM:
/* transient failure, wait a little and
continue */
- Mfprintf(_mero_ctlerr, "error during accept:
%s",
+ Mfprintf(_mero_ctlerr, "error during accept:
%s\n",
strerror(errno));
sleep_ms(500);
break;
@@ -1274,7 +1274,7 @@ controlRunner(void *d)
break;
default:
/* anything else */
- Mfprintf(_mero_ctlerr, "error during accept:
%s",
+ Mfprintf(_mero_ctlerr, "error during accept:
%s\n",
strerror(errno));
break;
}
diff --git a/tools/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -1178,7 +1178,7 @@ fork_profiler(const char *dbname, sabdb
exit(1);
} else {
/* write pid of stethoscope */
- Mfprintf(pidfile, "%d", (int)pid);
+ Mfprintf(pidfile, "%d\n", (int)pid);
fclose(pidfile);
}
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
@@ -255,7 +255,7 @@ void reinitialize(void)
if ((_mero_logfile = fdopen(t, "a")) == NULL) {
/* revert to old log so that we have something */
Mfprintf(f, "%s ERR merovingian[%lld]: "
- "failed to reopen logfile",
+ "failed to reopen logfile\n",
mytime, (long long
int)_mero_topdp->next->pid);
_mero_topdp->out = _mero_topdp->err = fileno(f);
_mero_logfile = f;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
