Changeset: 8c29360712d5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8c29360712d5
Modified Files:
gdk/gdk_tracer.c
Branch: Jul2021
Log Message:
At an embedded connection, set the GDK error buffer if available, but don't
write to tracer
diffs (34 lines):
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -454,9 +454,6 @@ GDKtracer_log(const char *file, const ch
const char *syserr,
const char *fmt, ...)
{
- if ((adapter_t) ATOMIC_GET(&cur_adapter) == MBEDDED)
- return;
-
int bytes_written;
char buffer[512]; /* should be plenty big enough for a message */
va_list va;
@@ -501,7 +498,8 @@ GDKtracer_log(const char *file, const ch
}
va_end(va);
if (bytes_written < 0) {
- GDK_TRACER_EXCEPTION("Failed to write logs\n");
+ if ((adapter_t) ATOMIC_GET(&cur_adapter) != MBEDDED)
+ GDK_TRACER_EXCEPTION("Failed to write logs\n");
return;
}
char *p;
@@ -521,6 +519,10 @@ GDKtracer_log(const char *file, const ch
}
}
+ /* don't write to file on embedded case, but set the GDK error buffer */
+ if ((adapter_t) ATOMIC_GET(&cur_adapter) == MBEDDED)
+ return;
+
if (level <= M_WARNING) {
fprintf(stderr, "#%s%s%s: %s: %s%s%s%s\n",
add_ts ? ts : "",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
