<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24707">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">main: do not use fprintf to log fatal errors<br><br>In main there are some fatal errors that lead into exiting osmo-bts. The<br>errors are logged via fprintf. Those messages are not unimportant for<br>finding faults, so lets use LOGP() to benefit from the libosmocore<br>logging system.<br><br>Change-Id: I2ae4acf6a92137236e1b62c2d0aab79a34134f45<br>---<br>M src/common/main.c<br>1 file changed, 15 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/24707/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/main.c b/src/common/main.c</span><br><span>index 0b7d3fb..79e97c8 100644</span><br><span>--- a/src/common/main.c</span><br><span>+++ b/src/common/main.c</span><br><span>@@ -92,19 +92,19 @@</span><br><span> case 1:</span><br><span> vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg);</span><br><span> if (vty_ref_mode < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "%s: Unknown VTY reference generation "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "%s: Unknown VTY reference generation "</span><br><span> "mode '%s'\n", prog_name, optarg);</span><br><span> exit(2);</span><br><span> }</span><br><span> break;</span><br><span> case 2:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "Generating the VTY reference in mode '%s' (%s)\n",</span><br><span> get_value_string(vty_ref_gen_mode_names, vty_ref_mode),</span><br><span> get_value_string(vty_ref_gen_mode_desc, vty_ref_mode));</span><br><span> vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode);</span><br><span> exit(0);</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "%s: error parsing cmdline options\n", prog_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "%s: error parsing cmdline options\n", prog_name);</span><br><span> exit(2);</span><br><span> }</span><br><span> }</span><br><span>@@ -303,7 +303,7 @@</span><br><span> </span><br><span> g_bts = gsm_bts_alloc(tall_bts_ctx, 0);</span><br><span> if (!g_bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to create BTS structure\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "Failed to create BTS structure\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span>@@ -315,14 +315,14 @@</span><br><span> param.sched_priority = rt_prio;</span><br><span> rc = sched_setscheduler(getpid(), SCHED_RR, ¶m);</span><br><span> if (rc != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Setting SCHED_RR priority(%d) failed: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "Setting SCHED_RR priority(%d) failed: %s\n",</span><br><span> param.sched_priority, strerror(errno));</span><br><span> exit(1);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> if (bts_init(g_bts) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "unable to open bts\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "unable to open bts\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span>@@ -330,19 +330,19 @@</span><br><span> </span><br><span> rc = vty_read_config_file(config_file, NULL);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to parse the config file: '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "Failed to parse the config file: '%s'\n",</span><br><span> config_file);</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span> if (!phy_link_by_num(0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "You need to configure at least phy0\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "You need to configure at least phy0\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span> llist_for_each_entry(trx, &g_bts->trx_list, list) {</span><br><span> if (!trx->pinst) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "TRX %u has no associated PHY instance\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "TRX %u has no associated PHY instance\n",</span><br><span> trx->nr);</span><br><span> exit(1);</span><br><span> }</span><br><span>@@ -370,7 +370,7 @@</span><br><span> g_bts->gsmtap.inst = gsmtap_source_init(g_bts->gsmtap.remote_host,</span><br><span> GSMTAP_UDP_PORT, 1);</span><br><span> if (g_bts->gsmtap.inst == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed during gsmtap_source_init()\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "Failed during gsmtap_source_init()\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> gsmtap_source_add_sink(g_bts->gsmtap.inst);</span><br><span>@@ -381,12 +381,12 @@</span><br><span> rc = telnet_init_dynif(tall_bts_ctx, NULL, vty_get_bind_addr(),</span><br><span> g_vty_port_num);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Error initializing telnet\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "Error initializing telnet\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span> if (pcu_sock_init(g_bts->pcu.sock_path)) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "PCU L1 socket failed\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "PCU L1 socket failed\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span>@@ -398,19 +398,19 @@</span><br><span> osmo_init_ignore_signals();</span><br><span> </span><br><span> if (!g_bts->bsc_oml_host) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Cannot start BTS without knowing BSC OML IP\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DABIS, LOGL_FATAL, "Cannot start BTS without knowing BSC OML IP\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span> line = abis_open(g_bts, g_bts->bsc_oml_host, "osmo-bts");</span><br><span> if (!line) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "unable to connect to BSC\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DABIS, LOGL_FATAL, "unable to connect to BSC\n");</span><br><span> exit(2);</span><br><span> }</span><br><span> </span><br><span> rc = phy_links_open();</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "unable to open PHY link(s)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_FATAL, "unable to open PHY link(s)\n");</span><br><span> exit(2);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24707">change 24707</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-bts/+/24707"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2ae4acf6a92137236e1b62c2d0aab79a34134f45 </div>
<div style="display:none"> Gerrit-Change-Number: 24707 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>