mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-27 15:18:06 +00:00
Code Issues Releases Wiki Activity

ovsdb-client: Fix regression introduced with changes to daemonize().

Browse Source 
daemonize() now closes the standard file descriptors, but ovsdb-client's
"monitor" command uses stdout even after daemonizing.  This caused
tests that used "ovsdb-client --detach monitor" to fail without printing
their complete output.  This commit fixes the problem.
This commit is contained in:
Ben Pfaff
2010-01-13 09:55:52 -08:00
parent 55368fb836
commit eb8d3ed67c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ovsdb/ovsdb-client.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009 Nicira Networks. * Copyright (c) 2009, 2010 Nicira Networks.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -842,7 +842,14 @@ do_monitor(int argc, char *argv[])
&& json_equal(msg->id, request_id)) { && json_equal(msg->id, request_id)) {
monitor_print(msg->result, table, &columns, true); monitor_print(msg->result, table, &columns, true);
fflush(stdout); fflush(stdout);
daemonize(); if (get_detach()) {
/* daemonize() closes the standard file descriptors. We output
* to stdout, so we need to save and restore STDOUT_FILENO. */
int fd = dup(STDOUT_FILENO);
daemonize();
dup2(fd, STDOUT_FILENO);
close(fd);
}
} else if (msg->type == JSONRPC_NOTIFY } else if (msg->type == JSONRPC_NOTIFY
&& !strcmp(msg->method, "update")) { && !strcmp(msg->method, "update")) {
struct json *params = msg->params; struct json *params = msg->params;