Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:ennorehling/eressea

This commit is contained in:
Enno Rehling 2016-08-31 17:05:02 +02:00
parent ecc2eaf999 3e47f02fc2
commit 149a99caa3
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/e2/terrains.json
View File

@ -141,7 +141,7 @@
}, },
"glacier": { "glacier": {
"size": 100, "size": 100,
"herbs": [ "h15", "h16", "h17" ], "herbs": [ "h18", "h19", "h20" ],
"seed": 2, "seed": 2,
"road": 250, "road": 250,
"flags": [ "arctic", "land", "walk", "sail", "fly" ], "flags": [ "arctic", "land", "walk", "sail", "fly" ],

26
src/util/log.c
View File

@ -102,21 +102,29 @@ void log_rotate(const char *filename, int maxindex)
assert(strlen(filename) < sizeof(buffer[0]) - 4); assert(strlen(filename) < sizeof(buffer[0]) - 4);
sprintf(buffer[dst], "%s.%d", filename, maxindex); sprintf(buffer[dst], "%s.%d", filename, maxindex);
#ifdef HAVE_UNISTD_H if (remove(buffer[dst]) != 0) {
/* make sure we don't overwrite an existing file (hard links) */ if (errno != ENOENT) {
unlink(buffer[dst]); fprintf(stderr, "log rotate %s: %d %s", buffer[dst], errno, strerror(errno));
#endif }
errno = 0;
}
while (maxindex > 0) { while (maxindex > 0) {
int err, src = 1 - dst; int src = 1 - dst;
sprintf(buffer[src], "%s.%d", filename, --maxindex); sprintf(buffer[src], "%s.%d", filename, --maxindex);
err = rename(buffer[src], buffer[dst]); if (rename(buffer[src], buffer[dst]) != 0) {
if (err != 0) { if (errno != ENOENT) {
log_debug("log rotate %s: %s", buffer[dst], strerror(errno)); fprintf(stderr, "log rotate %s: %d %s", buffer[dst], errno, strerror(errno));
}
errno = 0;
} }
dst = src; dst = src;
} }
if (rename(filename, buffer[dst]) != 0) { if (rename(filename, buffer[dst]) != 0) {
log_debug("log rotate %s: %s", buffer[dst], strerror(errno)); if (errno != ENOENT) {
fprintf(stderr, "log rotate %s: %d %s", buffer[dst], errno, strerror(errno));
}
errno = 0;
} }
} }