diff --git a/ChangeLog b/ChangeLog index 7c0acdb..808632a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,7 @@ Version 4.5.2 'dan Eider': * Add support for proxy protocol V1 - merge PR #618 (by Paul Wayper) * Print full date and time in logs - * Add new options: "new-log-timestamp" and "new-timestamp-format" + * Add new options: "new-log-timestamp" and "new-log-timestamp-format" - merge PR #599 (by Cédric Krier) * Do not use FIPS and remove hardcode OPENSSL_VERSION_NUMBER with LibreSSL - update Docker mongoDB and fix with workaround the missing systemctl diff --git a/README.turnserver b/README.turnserver index 0468a09..77b205b 100644 --- a/README.turnserver +++ b/README.turnserver @@ -227,7 +227,7 @@ Flags: --new-log-timestamp Enable full ISO-8601 timestamp in all logs. ---new-timestamp-format Set timestamp format (in strftime(1) format) +--new-log-timestamp-format Set timestamp format (in strftime(1) format) --secure-stun Require authentication of the STUN Binding request. By default, the clients are allowed anonymous access to the STUN Binding functionality. diff --git a/examples/etc/turnserver.conf b/examples/etc/turnserver.conf index 028d59b..aa91964 100644 --- a/examples/etc/turnserver.conf +++ b/examples/etc/turnserver.conf @@ -538,7 +538,7 @@ #new-log-timestamp # Set timestamp format (in strftime(1) format) -#new-timestamp-format "%FT%T%z" +#new-log-timestamp-format "%FT%T%z" # Option to set the "redirection" mode. The value of this option # will be the address of the alternate server for UDP & TCP service in the form of diff --git a/man/man1/turnserver.1 b/man/man1/turnserver.1 index 7464114..e3bd325 100644 --- a/man/man1/turnserver.1 +++ b/man/man1/turnserver.1 @@ -342,7 +342,7 @@ This option can be used, for example, together with the logrotate tool. Enable full ISO\-8601 timestamp in all logs. .TP .B -\fB\-\-new\-timestamp\-format\fP +\fB\-\-new\-log\-timestamp\-format\fP Set timestamp format (in \fBstrftime\fP(1) format) .TP .B diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index ff35729..7da6d1b 100644 --- a/src/apps/relay/mainrelay.c +++ b/src/apps/relay/mainrelay.c @@ -604,7 +604,7 @@ static char Usage[] = "Usage: turnserver [options]\n" " name will be constructed as-is, without PID and date appendage.\n" " This option can be used, for example, together with the logrotate tool.\n" " --new-log-timestamp Enable full ISO-8601 timestamp in all logs.\n" -" --new-timestamp-format Set timestamp format (in strftime(1) format)\n" +" --new-log-timestamp-format Set timestamp format (in strftime(1) format)\n" " --stale-nonce[=] Use extra security with nonce value having limited lifetime (default 600 secs).\n" " --max-allocate-lifetime Set the maximum value for the allocation lifetime. Default to 3600 secs.\n" " --channel-lifetime Set the lifetime for channel binding, default to 600 secs.\n" @@ -764,7 +764,7 @@ enum EXTRA_OPTS { SYSLOG_OPT, SIMPLE_LOG_OPT, NEW_LOG_TIMESTAMP_OPT, - NEW_TIMESTAMP_FORMAT_OPT, + NEW_LOG_TIMESTAMP_FORMAT_OPT, AUX_SERVER_OPT, UDP_SELF_BALANCE_OPT, ALTERNATE_SERVER_OPT, @@ -904,7 +904,7 @@ static const struct myoption long_options[] = { { "syslog", optional_argument, NULL, SYSLOG_OPT }, { "simple-log", optional_argument, NULL, SIMPLE_LOG_OPT }, { "new-log-timestamp", optional_argument, NULL, NEW_LOG_TIMESTAMP_OPT }, - { "new-timestamp-format", required_argument, NULL, NEW_TIMESTAMP_FORMAT_OPT }, + { "new-log-timestamp-format", required_argument, NULL, NEW_LOG_TIMESTAMP_FORMAT_OPT }, { "aux-server", required_argument, NULL, AUX_SERVER_OPT }, { "udp-self-balance", optional_argument, NULL, UDP_SELF_BALANCE_OPT }, { "alternate-server", required_argument, NULL, ALTERNATE_SERVER_OPT }, @@ -1592,6 +1592,13 @@ static void set_option(int c, char *value) turn_params.rest_api_separator=*value; } break; + case NEW_LOG_TIMESTAMP_OPT: + use_new_log_timestamp_format=1; + break; + case NEW_LOG_TIMESTAMP_FORMAT_OPT: + set_turn_log_timestamp_format(value); + break; + /* these options have been already taken care of before: */ case 'l': case NO_STDOUT_LOG_OPT: @@ -1725,7 +1732,7 @@ static void read_config_file(int argc, char **argv, int pass) set_simple_log(get_bool_value(value)); } else if ((pass==0) && (c==NEW_LOG_TIMESTAMP_OPT)) { use_new_log_timestamp_format=1; - } else if ((pass==0) && (c==NEW_TIMESTAMP_FORMAT_OPT)) { + } else if ((pass==0) && (c==NEW_LOG_TIMESTAMP_FORMAT_OPT)) { set_turn_log_timestamp_format(value); } else if((pass == 0) && (c != 'u')) { set_option(c, value);