Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 0b05f6c2 编写于 作者: D Daniel Veillard
浏览文件
操作

convert old logging to the new API 

* src/node_device_devkit.c src/uml_driver.c src/virterror.c:
  convert old logging to the new API
daniel
上级 f99b202f
隐藏空白更改
内联 并排
Showing with 121 addition and 95 deletion
ChangeLog
浏览文件 @ 0b05f6c2
Mon Dec 22 11:47:44 CET 2008 Daniel Veillard <veillard@redhat.com>
* src/node_device_devkit.c src/uml_driver.c src/virterror.c:
convert old logging to the new API
Mon Dec 22 11:45:07 CET 2008 Daniel Veillard <veillard@redhat.com> Mon Dec 22 11:45:07 CET 2008 Daniel Veillard <veillard@redhat.com>
* src/libvirt.c: convert entry points to new logging * src/libvirt.c: convert entry points to new logging
......
src/node_device_devkit.c
浏览文件 @ 0b05f6c2
...@@ -41,9 +41,6 @@ ...@@ -41,9 +41,6 @@
static virDeviceMonitorStatePtr driverState; static virDeviceMonitorStatePtr driverState;
#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
#define CONN_DRV_STATE(conn) \ #define CONN_DRV_STATE(conn) \
((virDeviceMonitorStatePtr)((conn)->devMonPrivateData)) ((virDeviceMonitorStatePtr)((conn)->devMonPrivateData))
#define DRV_STATE_DKCLIENT(ds) ((DevkitClient *)((ds)->privateData)) #define DRV_STATE_DKCLIENT(ds) ((DevkitClient *)((ds)->privateData))
......
src/uml_driver.c
浏览文件 @ 0b05f6c2
...@@ -62,17 +62,15 @@ ...@@ -62,17 +62,15 @@
#include "uuid.h" #include "uuid.h"
#include "domain_conf.h" #include "domain_conf.h"
#include "datatypes.h" #include "datatypes.h"
#include "logging.h"
/* For storing short-lived temporary files. */ /* For storing short-lived temporary files. */
#define TEMPDIR LOCAL_STATE_DIR "/cache/libvirt" #define TEMPDIR LOCAL_STATE_DIR "/cache/libvirt"
static int umlShutdown(void); static int umlShutdown(void);
/* umlDebug statements should be changed to use this macro instead. */ #define umlLog(level, msg, ...) \
#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__) virLogMessage(__FILE__, level, __func__, __LINE__, 0, msg, __VA_ARGS__)
#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
#define umlLog(level, msg...) fprintf(stderr, msg)
static void umlDriverLock(struct uml_driver *driver) static void umlDriverLock(struct uml_driver *driver)
{ {
...@@ -100,7 +98,7 @@ static int umlSetCloseExec(int fd) { ...@@ -100,7 +98,7 @@ static int umlSetCloseExec(int fd) {
goto error; goto error;
return 0; return 0;
error: error:
umlLog(UML_ERR, umlLog(VIR_LOG_ERROR,
"%s", _("Failed to set close-on-exec file descriptor flag\n")); "%s", _("Failed to set close-on-exec file descriptor flag\n"));
return -1; return -1;
} }
...@@ -141,7 +139,7 @@ umlAutostartConfigs(struct uml_driver *driver) { ...@@ -141,7 +139,7 @@ umlAutostartConfigs(struct uml_driver *driver) {
!virDomainIsActive(driver->domains.objs[i]) && !virDomainIsActive(driver->domains.objs[i]) &&
umlStartVMDaemon(conn, driver, driver->domains.objs[i]) < 0) { umlStartVMDaemon(conn, driver, driver->domains.objs[i]) < 0) {
virErrorPtr err = virGetLastError(); virErrorPtr err = virGetLastError();
umlLog(UML_ERR, _("Failed to autostart VM '%s': %s\n"), umlLog(VIR_LOG_ERROR, _("Failed to autostart VM '%s': %s\n"),
driver->domains.objs[i]->def->name, err->message); driver->domains.objs[i]->def->name, err->message);
} }
} }
...@@ -323,7 +321,7 @@ umlStartup(void) { ...@@ -323,7 +321,7 @@ umlStartup(void) {
uml_driver->nextvmid = 1; uml_driver->nextvmid = 1;
if (!(pw = getpwuid(uid))) { if (!(pw = getpwuid(uid))) {
umlLog(UML_ERR, _("Failed to find user record for uid '%d': %s\n"), umlLog(VIR_LOG_ERROR, _("Failed to find user record for uid '%d': %s\n"),
uid, strerror(errno)); uid, strerror(errno));
goto error; goto error;
} }
...@@ -368,12 +366,12 @@ umlStartup(void) { ...@@ -368,12 +366,12 @@ umlStartup(void) {
if ((uml_driver->inotifyFD = inotify_init()) < 0) { if ((uml_driver->inotifyFD = inotify_init()) < 0) {
umlLog(UML_ERR, "%s", _("cannot initialize inotify")); umlLog(VIR_LOG_ERROR, "%s", _("cannot initialize inotify"));
goto error; goto error;
} }
if (virFileMakePath(uml_driver->monitorDir) < 0) { if (virFileMakePath(uml_driver->monitorDir) < 0) {
umlLog(UML_ERR, _("Failed to create monitor directory %s: %s"), umlLog(VIR_LOG_ERROR, _("Failed to create monitor directory %s: %s"),
uml_driver->monitorDir, strerror(errno)); uml_driver->monitorDir, strerror(errno));
goto error; goto error;
} }
...@@ -403,7 +401,7 @@ umlStartup(void) { ...@@ -403,7 +401,7 @@ umlStartup(void) {
return 0; return 0;
out_of_memory: out_of_memory:
umlLog (UML_ERR, umlLog (VIR_LOG_ERROR,
"%s", _("umlStartup: out of memory\n")); "%s", _("umlStartup: out of memory\n"));
error: error:
...@@ -785,25 +783,25 @@ static int umlStartVMDaemon(virConnectPtr conn, ...@@ -785,25 +783,25 @@ static int umlStartVMDaemon(virConnectPtr conn,
tmp = progenv; tmp = progenv;
while (*tmp) { while (*tmp) {
if (safewrite(logfd, *tmp, strlen(*tmp)) < 0) if (safewrite(logfd, *tmp, strlen(*tmp)) < 0)
umlLog(UML_WARN, _("Unable to write envv to logfile %d: %s\n"), umlLog(VIR_LOG_WARN, _("Unable to write envv to logfile %d: %s\n"),
errno, strerror(errno)); errno, strerror(errno));
if (safewrite(logfd, " ", 1) < 0) if (safewrite(logfd, " ", 1) < 0)
umlLog(UML_WARN, _("Unable to write envv to logfile %d: %s\n"), umlLog(VIR_LOG_WARN, _("Unable to write envv to logfile %d: %s\n"),
errno, strerror(errno)); errno, strerror(errno));
tmp++; tmp++;
} }
tmp = argv; tmp = argv;
while (*tmp) { while (*tmp) {
if (safewrite(logfd, *tmp, strlen(*tmp)) < 0) if (safewrite(logfd, *tmp, strlen(*tmp)) < 0)
umlLog(UML_WARN, _("Unable to write argv to logfile %d: %s\n"), umlLog(VIR_LOG_WARN, _("Unable to write argv to logfile %d: %s\n"),
errno, strerror(errno)); errno, strerror(errno));
if (safewrite(logfd, " ", 1) < 0) if (safewrite(logfd, " ", 1) < 0)
umlLog(UML_WARN, _("Unable to write argv to logfile %d: %s\n"), umlLog(VIR_LOG_WARN, _("Unable to write argv to logfile %d: %s\n"),
errno, strerror(errno)); errno, strerror(errno));
tmp++; tmp++;
} }
if (safewrite(logfd, "\n", 1) < 0) if (safewrite(logfd, "\n", 1) < 0)
umlLog(UML_WARN, _("Unable to write argv to logfile %d: %s\n"), umlLog(VIR_LOG_WARN, _("Unable to write argv to logfile %d: %s\n"),
errno, strerror(errno)); errno, strerror(errno));
vm->monitor = -1; vm->monitor = -1;
...@@ -820,7 +818,7 @@ static int umlStartVMDaemon(virConnectPtr conn, ...@@ -820,7 +818,7 @@ static int umlStartVMDaemon(virConnectPtr conn,
/* Cleanup intermediate proces */ /* Cleanup intermediate proces */
if (waitpid(pid, NULL, 0) != pid) if (waitpid(pid, NULL, 0) != pid)
umlLog(UML_WARN, _("failed to wait on process: %d: %s\n"), umlLog(VIR_LOG_WARN, _("failed to wait on process: %d: %s\n"),
pid, strerror(errno)); pid, strerror(errno));
for (i = 0 ; argv[i] ; i++) for (i = 0 ; argv[i] ; i++)
...@@ -861,7 +859,7 @@ static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -861,7 +859,7 @@ static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
vm->monitor = -1; vm->monitor = -1;
if ((ret = waitpid(vm->pid, NULL, 0)) != vm->pid) { if ((ret = waitpid(vm->pid, NULL, 0)) != vm->pid) {
umlLog(UML_WARN, umlLog(VIR_LOG_WARN,
_("Got unexpected pid %d != %d\n"), _("Got unexpected pid %d != %d\n"),
ret, vm->pid); ret, vm->pid);
} }
......
src/virterror.c
浏览文件 @ 0b05f6c2
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "virterror_internal.h" #include "virterror_internal.h"
#include "datatypes.h" #include "datatypes.h"
#include "logging.h"
virError virLastErr = /* the last error */ virError virLastErr = /* the last error */
{ .code = 0, .domain = 0, .message = NULL, .level = VIR_ERR_NONE, { .code = 0, .domain = 0, .message = NULL, .level = VIR_ERR_NONE,
...@@ -62,6 +63,97 @@ void *virUserData = NULL; /* associated data */ ...@@ -62,6 +63,97 @@ void *virUserData = NULL; /* associated data */
}} \ }} \
} }
static virLogPriority virErrorLevelPriority(virErrorLevel level) {
switch (level) {
case VIR_ERR_NONE:
return(VIR_LOG_INFO);
case VIR_ERR_WARNING:
return(VIR_LOG_WARN);
case VIR_ERR_ERROR:
return(VIR_LOG_ERROR);
}
return(VIR_LOG_ERROR);
}
static const char *virErrorDomainName(virErrorDomain domain) {
const char *dom = "unknown";
switch (domain) {
case VIR_FROM_NONE:
dom = "";
break;
case VIR_FROM_XEN:
dom = "Xen ";
break;
case VIR_FROM_XML:
dom = "XML ";
break;
case VIR_FROM_XEND:
dom = "Xen Daemon ";
break;
case VIR_FROM_XENSTORE:
dom = "Xen Store ";
break;
case VIR_FROM_XEN_INOTIFY:
dom = "Xen Inotify ";
break;
case VIR_FROM_DOM:
dom = "Domain ";
break;
case VIR_FROM_RPC:
dom = "XML-RPC ";
break;
case VIR_FROM_QEMU:
dom = "QEMU ";
break;
case VIR_FROM_NET:
dom = "Network ";
break;
case VIR_FROM_TEST:
dom = "Test ";
break;
case VIR_FROM_REMOTE:
dom = "Remote ";
break;
case VIR_FROM_SEXPR:
dom = "S-Expr ";
break;
case VIR_FROM_PROXY:
dom = "PROXY ";
break;
case VIR_FROM_CONF:
dom = "Config ";
break;
case VIR_FROM_OPENVZ:
dom = "OpenVZ ";
break;
case VIR_FROM_XENXM:
dom = "Xen XM ";
break;
case VIR_FROM_STATS_LINUX:
dom = "Linux Stats ";
break;
case VIR_FROM_LXC:
dom = "Linux Container ";
break;
case VIR_FROM_STORAGE:
dom = "Storage ";
break;
case VIR_FROM_NETWORK:
dom = "Network Config ";
break;
case VIR_FROM_DOMAIN:
dom = "Domain Config ";
break;
case VIR_FROM_NODEDEV:
dom = "Node Device ";
break;
case VIR_FROM_UML:
dom = "UML ";
break;
}
return(dom);
}
/* /*
* virGetLastError: * virGetLastError:
* *
...@@ -246,80 +338,7 @@ virDefaultErrorFunc(virErrorPtr err) ...@@ -246,80 +338,7 @@ virDefaultErrorFunc(virErrorPtr err)
lvl = _("error"); lvl = _("error");
break; break;
} }
switch (err->domain) { dom = virErrorDomainName(err->domain);
case VIR_FROM_NONE:
dom = "";
break;
case VIR_FROM_XEN:
dom = "Xen ";
break;
case VIR_FROM_XML:
dom = "XML ";
break;
case VIR_FROM_XEND:
dom = "Xen Daemon ";
break;
case VIR_FROM_XENSTORE:
dom = "Xen Store ";
break;
case VIR_FROM_XEN_INOTIFY:
dom = "Xen Inotify ";
break;
case VIR_FROM_DOM:
dom = "Domain ";
break;
case VIR_FROM_RPC:
dom = "XML-RPC ";
break;
case VIR_FROM_QEMU:
dom = "QEMU ";
break;
case VIR_FROM_NET:
dom = "Network ";
break;
case VIR_FROM_TEST:
dom = "Test ";
break;
case VIR_FROM_REMOTE:
dom = "Remote ";
break;
case VIR_FROM_SEXPR:
dom = "S-Expr ";
break;
case VIR_FROM_PROXY:
dom = "PROXY ";
break;
case VIR_FROM_CONF:
dom = "Config ";
break;
case VIR_FROM_OPENVZ:
dom = "OpenVZ ";
break;
case VIR_FROM_XENXM:
dom = "Xen XM ";
break;
case VIR_FROM_STATS_LINUX:
dom = "Linux Stats ";
break;
case VIR_FROM_LXC:
dom = "Linux Container ";
break;
case VIR_FROM_STORAGE:
dom = "Storage ";
break;
case VIR_FROM_NETWORK:
dom = "Network Config ";
break;
case VIR_FROM_DOMAIN:
dom = "Domain Config ";
break;
case VIR_FROM_NODEDEV:
dom = "Node Device ";
break;
case VIR_FROM_UML:
dom = "UML ";
break;
}
if ((err->dom != NULL) && (err->code != VIR_ERR_INVALID_DOMAIN)) { if ((err->dom != NULL) && (err->code != VIR_ERR_INVALID_DOMAIN)) {
domain = err->dom->name; domain = err->dom->name;
} else if ((err->net != NULL) && (err->code != VIR_ERR_INVALID_NETWORK)) { } else if ((err->net != NULL) && (err->code != VIR_ERR_INVALID_NETWORK)) {
...@@ -391,6 +410,13 @@ virRaiseError(virConnectPtr conn, virDomainPtr dom, virNetworkPtr net, ...@@ -391,6 +410,13 @@ virRaiseError(virConnectPtr conn, virDomainPtr dom, virNetworkPtr net,
VIR_GET_VAR_STR(msg, str); VIR_GET_VAR_STR(msg, str);
} }
/*
* Hook up the error or warning to the logging facility
* TODO: pass function name and lineno
*/
virLogMessage(virErrorDomainName(domain), virErrorLevelPriority(level),
NULL, 0, 1, "%s", str);
/* /*
* Save the information about the error * Save the information about the error
*/ */
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或