Changeset: 619b7fe95372 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=619b7fe95372
Modified Files:
gdk/gdk_logger.c
Branch: transaction-replication
Log Message:
Use the same location (through a new variable) for setting the log filenames
and 32-64 bit conversion
diffs (51 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1260,6 +1260,7 @@ logger_new(int debug, char *fn, logger_s
int id = LOG_SID;
logger *lg = (struct logger *) GDKmalloc(sizeof(struct logger));
FILE *fp;
+ char directory[BUFSIZ];
char filename[BUFSIZ];
char bak[BUFSIZ];
log_bid seqs_id = 0;
@@ -1283,15 +1284,16 @@ logger_new(int debug, char *fn, logger_s
/* if the logdir path is absolute, do not prefix it with the gdk_dbpath
*/
if (MT_path_absolute(log_settings->logdir)) {
- snprintf(filename, BUFSIZ, "%s%c%s%c",
+ snprintf(directory, BUFSIZ, "%s%c%s%c",
log_settings->logdir, DIR_SEP, fn, DIR_SEP);
} else {
- snprintf(filename, BUFSIZ, "%s%c%s%c%s%c",
+ snprintf(directory, BUFSIZ, "%s%c%s%c%s%c",
GDKgetenv("gdk_dbpath"), DIR_SEP,
log_settings->logdir, DIR_SEP, fn, DIR_SEP);
}
+
if ((lg->fn = GDKstrdup(fn)) == NULL ||
- (lg->dir = GDKstrdup(filename)) == NULL) {
+ (lg->dir = GDKstrdup(directory)) == NULL) {
fprintf(stderr, "!ERROR: logger_new: strdup failed\n");
GDKfree(lg->fn);
GDKfree(lg->dir);
@@ -1309,6 +1311,7 @@ logger_new(int debug, char *fn, logger_s
lg->seqs_id = NULL;
lg->seqs_val = NULL;
+ filename = directory;
snprintf(filename, BUFSIZ, "%s%s", lg->dir, LOGFILE);
snprintf(bak, BUFSIZ, "%s.bak", filename);
@@ -1419,10 +1422,7 @@ logger_new(int debug, char *fn, logger_s
* what we expect, the conversion was apparently done
* already, and so we can delete the file. */
- snprintf(cvfile, sizeof(cvfile),
- "%s%c%s%c%s%cconvert-32-64",
- GDKgetenv("gdk_dbpath"),
- DIR_SEP, log_settings->logdir, DIR_SEP, fn, DIR_SEP);
+ snprintf(cvfile, sizeof(cvfile), "%sconvert-32-64", directory);
snprintf(bak, sizeof(bak), "%s_32-64-convert", fn);
{
FILE *fp1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
