proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-08 10:02:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "use a default per-container logfile"

Browse Source 
The logfile changes broke lxc-info and possibly more command line
tools. Revert for now until we get those issues addressed.

This reverts commit b8e0503a1d.
This commit is contained in:
Stéphane Graber 2013-01-23 17:19:40 -05:00
parent b8e0503a1d
commit b02bbfacd7
1 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/lxc/log.c
View File

@ -125,47 +125,12 @@ extern void lxc_log_setprefix(const char *prefix)
log_prefix[sizeof(log_prefix) - 1] = 0; log_prefix[sizeof(log_prefix) - 1] = 0;
} }
static int build_dir(const char *name)
{
char *n = strdup(name); // because we'll be modifying it
char *p, *e;
int ret;
if (!n) {
ERROR("Out of memory while creating directory '%s'.", name);
return -1;
}
e = &n[strlen(n)];
for (p = n+1; p < e; p++) {
if (*p != '/')
continue;
*p = '\0';
if (access(n, F_OK)) {
ret = lxc_unpriv(mkdir(n, 0755));
if (ret && errno != -EEXIST) {
SYSERROR("failed to create directory '%s'.", n);
free(n);
return -1;
}
}
*p = '/';
}
free(n);
return 0;
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int log_open(const char *name) static int log_open(const char *name)
{ {
int fd; int fd;
int newfd; int newfd;
if (build_dir(name)) {
ERROR("failed to create dir for log file \"%s\" : %s", name,
strerror(errno));
return -1;
}
fd = lxc_unpriv(open(name, O_CREAT | O_WRONLY | fd = lxc_unpriv(open(name, O_CREAT | O_WRONLY |
O_APPEND | O_CLOEXEC, 0666)); O_APPEND | O_CLOEXEC, 0666));
if (fd == -1) { if (fd == -1) {
@ -195,6 +160,16 @@ static char *build_log_path(const char *name)
p = malloc(len); p = malloc(len);
if (!p) if (!p)
return p; return p;
ret = snprintf(p, len, "%s/%s", LOGPATH, name);
if (ret < 0 || ret >= len) {
free(p);
return NULL;
}
ret = mkdir(p, 0755);
if (ret == -1 && errno != EEXIST) {
free(p);
return NULL;
}
ret = snprintf(p, len, "%s/%s/%s.log", LOGPATH, name, name); ret = snprintf(p, len, "%s/%s/%s.log", LOGPATH, name, name);
if (ret < 0 || ret >= len) { if (ret < 0 || ret >= len) {
free(p); free(p);