提交 4ab79958 编写于 作者: D Daniel P. Berrange

Fix duplicating logging of errors in libvirtd

The libvirt default error handling callback will print all errors
to stderr. The libvirtd default logging callback will do the same.
Set a no-op error handling callback in libvirtd to prevent this
duplication

* daemon/libvirtd.c: Register a no-op error handling function
上级 5f672538
......@@ -776,6 +776,12 @@ static int qemudInitPaths(struct qemud_server *server,
return ret;
}
static void virshErrorHandler(void *opaque ATTRIBUTE_UNUSED, virErrorPtr err ATTRIBUTE_UNUSED)
{
/* Don't do anything, since logging infrastructure already
* took care of reporting the error */
}
static struct qemud_server *qemudInitialize(int sigread) {
struct qemud_server *server;
......@@ -2995,6 +3001,9 @@ int main(int argc, char **argv) {
if (remoteReadConfigFile (server, remote_config_file) < 0)
goto error2;
/* Disable error func, now logging is setup */
virSetErrorFunc(NULL, virshErrorHandler);
if (virEventAddHandleImpl(sigpipe[0],
VIR_EVENT_HANDLE_READABLE,
qemudDispatchSignalEvent,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册