Changeset: 8b227560a8d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8b227560a8d0
Modified Files:
gdk/gdk_logger.c
Branch: logger-fix
Log Message:
fix regression issue on forced log application
diffs (37 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -3213,19 +3213,22 @@ log_tstart(logger *lg, bool flushnow, ul
if (log_open_output(lg) != GDK_SUCCEED)
GDKfatal("Could not create new log file\n"); //
TODO: does not have to be fatal (yet)
}
+ do_rotate(lg);
+ rotation_unlock(lg);
+ (void) do_flush_range_cleanup(lg);
+
+ if (lg->saved_id+1 < lg->id)
+ log_flush(lg, (1ULL<<63));
lg->flushnow = flushnow;
}
- else if (check_rotation_conditions(lg)) {
- lg->id++;
- if (log_open_output(lg) != GDK_SUCCEED)
- GDKfatal("Could not create new log file\n"); // TODO:
does not have to be fatal (yet)
- }
- do_rotate(lg);
- rotation_unlock(lg);
-
- if (lg->flushnow && lg->saved_id+1 < lg->id) {
- (void) do_flush_range_cleanup(lg);
- log_flush(lg, (1ULL<<63));
+ else {
+ if (check_rotation_conditions(lg)) {
+ lg->id++;
+ if (log_open_output(lg) != GDK_SUCCEED)
+ GDKfatal("Could not create new log file\n"); //
TODO: does not have to be fatal (yet)
+ }
+ do_rotate(lg);
+ rotation_unlock(lg);
}
(void) ATOMIC_INC(&lg->current->refcount);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
