Changeset: d29e14b2ec3e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d29e14b2ec3e
Modified Files:
gdk/gdk_utils.c
monetdb5/modules/mal/mal_mapi.c
Branch: default
Log Message:
Changed some error from ERROR to CRITICAL and vice versa.
diffs (92 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -80,11 +80,11 @@ static bool
GDKenvironment(const char *dbpath)
{
if (dbpath == NULL) {
- TRC_ERROR(GDK, "Database name missing.\n");
+ TRC_CRITICAL(GDK, "Database name missing.\n");
return false;
}
if (strlen(dbpath) >= FILENAME_MAX) {
- TRC_ERROR(GDK, "Database name too long.\n");
+ TRC_CRITICAL(GDK, "Database name too long.\n");
return false;
}
if (!MT_path_absolute(dbpath)) {
@@ -1311,7 +1311,7 @@ GDKerror(const char *format, ...)
}
va_start(ap, format);
if (vsnprintf(message + len, sizeof(message) - (len + 2), format, ap) <
0){
- TRC_ERROR(GDK, "an error occurred within GDKerror.\n");
+ TRC_CRITICAL(GDK, "an error occurred within GDKerror.\n");
strcpy(message, GDKERROR "an error occurred within
GDKerror.\n");
}
va_end(ap);
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -150,7 +150,7 @@ doChallenge(void *data)
memcpy(challenge, ((struct challengedata *) data)->challenge,
sizeof(challenge));
GDKfree(data);
if (buf == NULL) {
- TRC_CRITICAL(MAL_SERVER, MAL_MALLOC_FAIL "\n");
+ TRC_ERROR(MAL_SERVER, MAL_MALLOC_FAIL "\n");
close_stream(fdin);
close_stream(fdout);
return;
@@ -442,7 +442,7 @@ SERVERlistenThread(SOCKET *Sock)
(void) shutdown(msgsock, SHUT_WR);
closesocket(msgsock);
if (!cmsg || cmsg->cmsg_type !=
SCM_RIGHTS) {
- TRC_ERROR(MAL_SERVER, "Expected
file descriptor, but received something else\n");
+ TRC_CRITICAL(MAL_SERVER,
"Expected file descriptor, but received something else\n");
continue;
}
/* HACK to avoid
@@ -456,7 +456,7 @@ SERVERlistenThread(SOCKET *Sock)
default:
/* some unknown state */
closesocket(msgsock);
- TRC_ERROR(MAL_SERVER, "Unknown command
type in first byte\n");
+ TRC_CRITICAL(MAL_SERVER, "Unknown
command type in first byte\n");
continue;
}
#endif
@@ -467,7 +467,7 @@ SERVERlistenThread(SOCKET *Sock)
data = GDKmalloc(sizeof(*data));
if( data == NULL){
closesocket(msgsock);
- TRC_CRITICAL(MAL_SERVER, SQLSTATE(HY013)
MAL_MALLOC_FAIL "\n");
+ TRC_ERROR(MAL_SERVER, SQLSTATE(HY013) MAL_MALLOC_FAIL
"\n");
continue;
}
data->in = socket_rstream(msgsock, "Server read");
@@ -478,7 +478,7 @@ SERVERlistenThread(SOCKET *Sock)
mnstr_destroy(data->out);
GDKfree(data);
closesocket(msgsock);
- TRC_CRITICAL(MAL_SERVER, "Cannot allocate stream\n");
+ TRC_ERROR(MAL_SERVER, "Cannot allocate stream\n");
continue;
}
s = block_stream(data->in);
@@ -503,7 +503,7 @@ SERVERlistenThread(SOCKET *Sock)
mnstr_destroy(data->out);
GDKfree(data);
closesocket(msgsock);
- TRC_CRITICAL(MAL_SERVER, "Cannot fork new client
thread\n");
+ TRC_ERROR(MAL_SERVER, "Cannot fork new client
thread\n");
continue;
}
} while (!ATOMIC_GET(&serverexiting) && !GDKexiting());
@@ -514,7 +514,7 @@ SERVERlistenThread(SOCKET *Sock)
closesocket(usock);
return;
error:
- TRC_ERROR(MAL_SERVER, "Terminating listener: %s\n", msg);
+ TRC_CRITICAL(MAL_SERVER, "Terminating listener: %s\n", msg);
if (sock != INVALID_SOCKET)
closesocket(sock);
if (usock != INVALID_SOCKET)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
