<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/26225">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Do not mention deprecated -l / --database options<br><br>Change-Id: I47fe7e64126710db34c49f48ea9e8f8d46662e4b<br>---<br>M doc/manuals/chapters/running.adoc<br>M src/osmo-msc/msc_main.c<br>2 files changed, 4 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc</span><br><span>index 988b84d..8665395 100644</span><br><span>--- a/doc/manuals/chapters/running.adoc</span><br><span>+++ b/doc/manuals/chapters/running.adoc</span><br><span>@@ -5,7 +5,7 @@</span><br><span> </span><br><span> === SYNOPSIS</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-*osmo-msc* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] [-l 'DATABASE']</span><br><span style="color: hsl(120, 100%, 40%);">+*osmo-msc* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL']</span><br><span> </span><br><span> === OPTIONS</span><br><span> </span><br><span>@@ -35,8 +35,6 @@</span><br><span>        Set the global log level for logging to stderr. This has mostly</span><br><span>      been deprecated by VTY based logging configuration, see</span><br><span>      <<logging>> for more information.</span><br><span style="color: hsl(0, 100%, 40%);">-*-l, --database 'DATABASE'*::</span><br><span style="color: hsl(0, 100%, 40%);">-      Specify the file name of the SQLite3 database to use as SMS storage</span><br><span> </span><br><span> </span><br><span> === Multiple instances</span><br><span>diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c</span><br><span>index 07d76dd..9657c71 100644</span><br><span>--- a/src/osmo-msc/msc_main.c</span><br><span>+++ b/src/osmo-msc/msc_main.c</span><br><span>@@ -127,7 +127,6 @@</span><br><span>         printf("  -D --daemonize             Fork the process into a background daemon.\n");</span><br><span>       printf("  -c --config-file filename  The config file to use.\n");</span><br><span>  printf("  -s --disable-color\n");</span><br><span style="color: hsl(0, 100%, 40%);">-     printf("  -l --database db-name      The database to use.\n");</span><br><span>     printf("  -T --timestamp             Prefix every log line with a timestamp.\n");</span><br><span>  printf("  -V --version               Print the version of OsmoMSC.\n");</span><br><span>    printf("  -e --log-level number      Set a global loglevel.\n");</span><br><span>@@ -173,7 +172,7 @@</span><br><span>                     {"daemonize", 0, 0, 'D'},</span><br><span>                  {"config-file", 1, 0, 'c'},</span><br><span>                        {"disable-color", 0, 0, 's'},</span><br><span style="color: hsl(0, 100%, 40%);">-                 {"database", 1, 0, 'l'},</span><br><span style="color: hsl(120, 100%, 40%);">+                    {"database", 1, 0, 'l'}, /* deprecated */</span><br><span>                  {"timestamp", 0, 0, 'T'},</span><br><span>                  {"version", 0, 0, 'V' },</span><br><span>                   {"log-level", 1, 0, 'e'},</span><br><span>@@ -208,6 +207,8 @@</span><br><span>                    break;</span><br><span>               case 'l':</span><br><span>                    msc_cmdline_config.database_name = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+                    fprintf(stderr, "Command line argument '-%c' is deprecated, use VTY "</span><br><span style="color: hsl(120, 100%, 40%);">+                               "parameter 'msc' / 'sms-database %s' instead.\n", c, optarg);</span><br><span>                      break;</span><br><span>               case 'c':</span><br><span>                    msc_cmdline_config.config_file = optarg;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/26225">change 26225</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-msc/+/26225"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I47fe7e64126710db34c49f48ea9e8f8d46662e4b </div>
<div style="display:none"> Gerrit-Change-Number: 26225 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>