#include "command-line.h"
#include "column.h"
#include "compiler.h"
+#include "daemon.h"
#include "dynamic-string.h"
#include "json.h"
#include "jsonrpc.h"
{"verbose", optional_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
+ DAEMON_LONG_OPTIONS,
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
vlog_set_verbosity(optarg);
break;
+ DAEMON_OPTION_HANDLERS
+
case '?':
exit(EXIT_FAILURE);
" (\"table\", \"html\", or \"csv\"\n"
" --wide don't limit TTY lines to 79 bytes\n"
" --no-headings omit table heading row\n");
+ daemon_usage();
vlog_usage();
printf("\nOther options:\n"
" -h, --help display this help message\n"
struct ovsdb_schema *schema;
int error;
- request = jsonrpc_create_request("get_schema", json_array_create_empty());
+ request = jsonrpc_create_request("get_schema", json_array_create_empty(),
+ NULL);
error = jsonrpc_transact_block(rpc, request, &reply);
if (error) {
ovs_fatal(error, "transaction failed");
transaction = parse_json(argv[2]);
rpc = open_jsonrpc(argv[1]);
- request = jsonrpc_create_request("transact", transaction);
+ request = jsonrpc_create_request("transact", transaction, NULL);
error = jsonrpc_transact_block(rpc, request, &reply);
if (error) {
ovs_fatal(error, "transaction failed");
json_object_put(monitor_requests, argv[2], monitor_request);
monitor = json_array_create_2(json_null_create(), monitor_requests);
- request = jsonrpc_create_request("monitor", monitor);
+ request = jsonrpc_create_request("monitor", monitor, NULL);
request_id = json_clone(request->id);
jsonrpc_send(rpc, request);
for (;;) {
} else if (msg->type == JSONRPC_REPLY
&& json_equal(msg->id, request_id)) {
monitor_print(msg->result, table, &columns, true);
+ fflush(stdout);
+ daemonize();
} else if (msg->type == JSONRPC_NOTIFY
&& !strcmp(msg->method, "update")) {
struct json *params = msg->params;
&& params->u.array.elems[0]->type == JSON_NULL) {
monitor_print(params->u.array.elems[1],
table, &columns, false);
+ fflush(stdout);
}
}
}