diff --git a/etc/vz.conf b/etc/vz.conf index a230f5a..8edbed3 100644 --- a/etc/vz.conf +++ b/etc/vz.conf @@ -7,8 +7,8 @@ VE0CPUUNITS=1000 ## Logging parameters LOGGING=yes LOGFILE=/var/log/vzctl.log -LOG_LEVEL=0 -VERBOSE=0 +LOG_LEVEL=2 +VERBOSE=1 ## Disk quota parameters DISK_QUOTA=yes diff --git a/src/enter.c b/src/enter.c index c4badf5..e576cfc 100644 --- a/src/enter.c +++ b/src/enter.c @@ -55,7 +55,7 @@ static int pty_alloc(int *master, int *slave, struct termios *tios, if ((name = ttyname(*slave)) == NULL) { logger(-1, errno, "Unable to get tty name"); } else { - logger(2, 0, "Open %s", name); + logger(3, 0, "Open %s", name); } return 0; } diff --git a/src/lib/config.c b/src/lib/config.c index bd3db10..0f2e58e 100644 --- a/src/lib/config.c +++ b/src/lib/config.c @@ -2038,7 +2038,7 @@ static int parse(envid_t veid, vps_param *vps_p, char *val, int id) ret = parse_features(&vps_p->res.env, val); break; default: - logger(10, 0, "Not handled parameter %d %s", id, val); + logger(3, 0, "Not handled parameter %d %s", id, val); break; } return ret; diff --git a/src/lib/cpu.c b/src/lib/cpu.c index 7af368b..9fb9bcd 100644 --- a/src/lib/cpu.c +++ b/src/lib/cpu.c @@ -62,7 +62,7 @@ static int set_cpulimit(envid_t veid, unsigned int cpulimit) { unsigned cpulim1024 = (float)cpulimit * 1024 / 100; - logger(0, 0, "Setting CPU limit: %d", cpulimit); + logger(1, 0, "Setting CPU limit: %d", cpulimit); if (fairsched_rate(veid, cpulim1024 ? 0 : 1, cpulim1024) < 0) { logger(-1, errno, "fairsched_rate"); return VZ_SETFSHD_ERROR; @@ -91,7 +91,7 @@ static int set_cpuunits(envid_t veid, unsigned int cpuunits) return VZ_SETFSHD_ERROR; } cpuweight = MAXCPUUNITS / cpuunits; - logger(0, 0, "Setting CPU units: %d", cpuunits); + logger(1, 0, "Setting CPU units: %d", cpuunits); ret = set_cpuweight(veid, cpuweight); return ret; } @@ -105,7 +105,7 @@ int env_set_vcpus(envid_t veid, unsigned int vcpus) { int ret; - logger(0, 0, "Setting CPUs: %d", vcpus); + logger(1, 0, "Setting CPUs: %d", vcpus); ret = fairsched_vcpus(veid, vcpus); if (ret) logger(-1, errno, "Unable to set cpus"); diff --git a/src/lib/dev.c b/src/lib/dev.c index ac517b6..29b715d 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -112,7 +112,7 @@ int vps_set_devperm(vps_handler *h, envid_t veid, char *root, dev_param *dev) logger(-1, 0, "Unable to apply devperm: VE is not running"); return VZ_VE_NOT_RUNNING; } - logger(0, 0, "Setting devices"); + logger(1, 0, "Setting devices"); list_for_each(res, dev_h, list) { if (res->name[0]) if ((ret = dev_create(root, res))) diff --git a/src/lib/env.c b/src/lib/env.c index c85d0c5..e591988 100644 --- a/src/lib/env.c +++ b/src/lib/env.c @@ -383,7 +383,7 @@ try: */ if (read(wait_p, &ret, sizeof(ret)) != 0) return 0; - logger(10, 0, "Starting init"); + logger(3, 0, "Starting init"); execve("/sbin/init", argv, envp); execve("/etc/init", argv, envp); execve("/bin/init", argv, envp); diff --git a/src/lib/exec.c b/src/lib/exec.c index 382b4ab..34314a2 100644 --- a/src/lib/exec.c +++ b/src/lib/exec.c @@ -446,7 +446,7 @@ int vps_exec_script(vps_handler *h, envid_t veid, char *root, if ((len = read_script(fname, func, &script)) < 0) return -1; - logger(1, 0, "Running VE script: %s", fname); + logger(2, 0, "Running VE script: %s", fname); ret = vps_exec(h, veid, root, MODE_BASH, argv, envp, script, timeout); if (script != NULL) free(script); diff --git a/src/lib/fs.c b/src/lib/fs.c index e538cc1..db33504 100644 --- a/src/lib/fs.c +++ b/src/lib/fs.c @@ -152,7 +152,7 @@ int vps_mount(vps_handler *h, envid_t veid, fs_param *fs, dq_param *dq, veid, MOUNT_PREFIX); } } - logger(0, 0, "VE is mounted"); + logger(1, 0, "VE is mounted"); return 0; } @@ -192,7 +192,7 @@ int vps_umount(vps_handler *h, envid_t veid, char *root, skipFlags skip) } } if (!(ret = fsumount(veid, root))) - logger(0, 0, "VE is unmounted"); + logger(1, 0, "VE is unmounted"); return ret; } diff --git a/src/lib/lock.c b/src/lib/lock.c index 25e819c..958a826 100644 --- a/src/lib/lock.c +++ b/src/lib/lock.c @@ -121,7 +121,7 @@ int vps_lock(envid_t veid, char *dir, char *status) ret = 1; break; } else { - logger(0, 0, "Removing stale lock" + logger(2, 0, "Removing stale lock" " file %s", lockfile); unlink(lockfile); } diff --git a/src/lib/meminfo.c b/src/lib/meminfo.c index a13262c..8ebdeb9 100644 --- a/src/lib/meminfo.c +++ b/src/lib/meminfo.c @@ -73,9 +73,9 @@ int vps_meminfo_set(vps_handler *h, envid_t veid, meminfo_param *param, return 0; } if (param->mode == VE_MEMINFO_NONE) - logger(0, 0, "Configure meminfo: none"); + logger(1, 0, "Configure meminfo: none"); else - logger(0, 0, "Configure meminfo: %lu", meminfo.val); + logger(1, 0, "Configure meminfo: %lu", meminfo.val); ret = ioctl(h->vzfd, VZCTL_VE_MEMINFO, &meminfo); if (ret < 0) { if (errno == ENOTTY) { diff --git a/src/lib/quota.c b/src/lib/quota.c index 9b33ee4..eed7ccc 100644 --- a/src/lib/quota.c +++ b/src/lib/quota.c @@ -425,7 +425,7 @@ int vps_quotaon(envid_t veid, char *private, dq_param *dq) return 0; } else { if (quota_ctl(veid, QUOTA_SHOW) == EXITCODE_QUOTNOTEXIST) { - logger(0, 0, "Initializing quota ..."); + logger(1, 0, "Initializing quota ..."); if ((ret = quota_init(veid, private, dq))) return ret; } diff --git a/src/lib/vps_configure.c b/src/lib/vps_configure.c index f139248..0897470 100644 --- a/src/lib/vps_configure.c +++ b/src/lib/vps_configure.c @@ -121,7 +121,7 @@ int vps_dns_configure(vps_handler *h, envid_t veid, dist_actions *actions, envp[i] = NULL; ret = vps_exec_script(h, veid, root, NULL, envp, script, DIST_FUNC, SCRIPT_EXEC_TIMEOUT); - logger(0, 0, "File resolv.conf was modified"); + logger(1, 0, "File resolv.conf was modified"); free_arg(envp); return ret; @@ -204,7 +204,7 @@ int vps_quota_configure(vps_handler *h, envid_t veid, dist_actions *actions, } envp[i++] = strdup(ENV_PATH); envp[i] = NULL; - logger(0, 0, "Setting quota ugidlimit: %d", *dq->ugidlimit); + logger(1, 0, "Setting quota ugidlimit: %d", *dq->ugidlimit); ret = vps_exec_script(h, veid, root, NULL, envp, script, DIST_FUNC, SCRIPT_EXEC_TIMEOUT); free_arg(envp); diff --git a/src/vzctl.c b/src/vzctl.c index 5a0d773..bf5404e 100644 --- a/src/vzctl.c +++ b/src/vzctl.c @@ -119,7 +119,7 @@ int main(int argc, char *argv[], char *envp[]) gparam = init_vps_param(); vps_p = init_vps_param(); cmd_p = init_vps_param(); - gparam->log.verbose = 0; + gparam->log.verbose = 1; sigemptyset(&act.sa_mask); act.sa_handler = SIG_IGN;