From: Andrej Zverev <andrej.zverev@gmail.com>
Date: Wed, 7 Dec 2016 10:32:16 +0000 (+0300)
Subject: respect -u option in cmd line
X-Git-Tag: 1.5.0~649^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f93250c5c3fd2dfcf7625614b9fc8e13a022e5b0;p=rspamd.git

respect -u option in cmd line
---

diff --git a/src/rspamadm/control.c b/src/rspamadm/control.c
index 2bdccc876..afe10663c 100644
--- a/src/rspamadm/control.c
+++ b/src/rspamadm/control.c
@@ -28,6 +28,7 @@
 
 static gchar *control_path = RSPAMD_DBDIR "/rspamd.sock";
 static gboolean json = FALSE;
+static gboolean ucl = TRUE;
 static gboolean compact = FALSE;
 static gdouble timeout = 1.0;
 
@@ -53,6 +54,8 @@ static GOptionEntry entries[] = {
 				"Output json",                    NULL},
 		{"compact", 'c', 0, G_OPTION_ARG_NONE, &compact,
 				"Output compacted", NULL},
+		{"ucl", 'u', 0, G_OPTION_ARG_NONE, &ucl,
+				"Output ucl (default)", NULL},
 		{"socket", 's', 0, G_OPTION_ARG_STRING, &control_path,
 				"Use the following socket path", NULL},
 		{"timeout", 't', 0, G_OPTION_ARG_DOUBLE, &timeout,
@@ -71,7 +74,7 @@ rspamadm_control_help (gboolean full_help)
 				"Where options are:\n\n"
 				"-c: output compacted json\n"
 				"-j: output linted json\n"
-				"-u: output ucl\n"
+				"-u: output ucl (default)\n"
 				"-s: use the following socket instead of " RSPAMD_DBDIR "/rspamd.sock\n"
 				"-t: set IO timeout (1.0 seconds default)\n"
 				"--help: shows available options and commands\n\n"