From aefbf7a829d12af4dad09b902038f4c5fe0d5b55 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Fri, 12 Nov 2021 20:28:08 +0300 Subject: [PATCH] Do not mention deprecated -l / --database options Change-Id: I47fe7e64126710db34c49f48ea9e8f8d46662e4b --- doc/manuals/chapters/running.adoc | 4 +--- src/osmo-msc/msc_main.c | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 988b84dbe..86653954e 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -5,7 +5,7 @@ arguments: === SYNOPSIS -*osmo-msc* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] [-l 'DATABASE'] +*osmo-msc* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] === OPTIONS @@ -35,8 +35,6 @@ arguments: Set the global log level for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <> for more information. -*-l, --database 'DATABASE'*:: - Specify the file name of the SQLite3 database to use as SMS storage === Multiple instances diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 07d76ddaa..9657c716d 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -127,7 +127,6 @@ static void print_help() printf(" -D --daemonize Fork the process into a background daemon.\n"); printf(" -c --config-file filename The config file to use.\n"); printf(" -s --disable-color\n"); - printf(" -l --database db-name The database to use.\n"); printf(" -T --timestamp Prefix every log line with a timestamp.\n"); printf(" -V --version Print the version of OsmoMSC.\n"); printf(" -e --log-level number Set a global loglevel.\n"); @@ -173,7 +172,7 @@ static void handle_options(int argc, char **argv) {"daemonize", 0, 0, 'D'}, {"config-file", 1, 0, 'c'}, {"disable-color", 0, 0, 's'}, - {"database", 1, 0, 'l'}, + {"database", 1, 0, 'l'}, /* deprecated */ {"timestamp", 0, 0, 'T'}, {"version", 0, 0, 'V' }, {"log-level", 1, 0, 'e'}, @@ -208,6 +207,8 @@ static void handle_options(int argc, char **argv) break; case 'l': msc_cmdline_config.database_name = optarg; + fprintf(stderr, "Command line argument '-%c' is deprecated, use VTY " + "parameter 'msc' / 'sms-database %s' instead.\n", c, optarg); break; case 'c': msc_cmdline_config.config_file = optarg;