summaryrefslogtreecommitdiffstats
path: root/src/openvpn/options.c
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-03-21 14:18:37 +0100
committerGert Doering <gert@greenie.muc.de>2014-03-22 19:19:38 +0100
commit8f7d5e671a49a316a5fd6392f480d51533fc2747 (patch)
treec987bbc8d246a039a98a3becd8e8d6acf2793837 /src/openvpn/options.c
parentc058cbffc182b6618182a3ff8b13c66d01ce937d (diff)
downloadopenvpn-8f7d5e671a49a316a5fd6392f480d51533fc2747.tar.gz
openvpn-8f7d5e671a49a316a5fd6392f480d51533fc2747.tar.xz
openvpn-8f7d5e671a49a316a5fd6392f480d51533fc2747.zip
Implement an easy parsable log output that allows access to flags of the log message
Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1395407925-25518-5-git-send-email-arne@rfc2549.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/8374 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/options.c')
-rw-r--r--src/openvpn/options.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index c4d9e51..e7259f7 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -343,6 +343,7 @@ static const char usage_message[] =
"--log file : Output log to file which is created/truncated on open.\n"
"--log-append file : Append log to file, or create file if nonexistent.\n"
"--suppress-timestamps : Don't log timestamps to stdout/stderr.\n"
+ "--machine-readable-output : Always log timestamp, message flags to stdout/stderr.\n"
"--writepid file : Write main process ID to file.\n"
"--nice n : Change process priority (>0 = lower, <0 = higher).\n"
"--echo [parms ...] : Echo parameters to log output.\n"
@@ -1511,6 +1512,7 @@ show_settings (const struct options *o)
SHOW_INT (inetd);
SHOW_BOOL (log);
SHOW_BOOL (suppress_timestamps);
+ SHOW_BOOL (machine_readable_output);
SHOW_INT (nice);
SHOW_INT (verbosity);
SHOW_INT (mute);
@@ -4722,6 +4724,12 @@ add_option (struct options *options,
options->suppress_timestamps = true;
set_suppress_timestamps(true);
}
+ else if (streq (p[0], "machine-readable-output"))
+ {
+ VERIFY_PERMISSION (OPT_P_GENERAL);
+ options->machine_readable_output = true;
+ set_machine_readable_output(true);
+ }
else if (streq (p[0], "log-append") && p[1])
{
VERIFY_PERMISSION (OPT_P_GENERAL);