<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10021">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mobile: use osmo_init_logging2 with proper talloc context<br><br>Change-Id: I231ac9987ff3c13fafcd272b7d9aae3938ab5972<br>---<br>M src/host/layer23/src/mobile/main.c<br>1 file changed, 5 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c</span><br><span>index 5a28be8..115ac41 100644</span><br><span>--- a/src/host/layer23/src/mobile/main.c</span><br><span>+++ b/src/host/layer23/src/mobile/main.c</span><br><span>@@ -46,8 +46,6 @@</span><br><span> #include <time.h></span><br><span> #include <libgen.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct log_target *stderr_target;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void *l23_ctx = NULL;</span><br><span> struct llist_head ms_list;</span><br><span> static char *gsmtap_ip = 0;</span><br><span>@@ -55,7 +53,6 @@</span><br><span> struct gsmtap_inst *gsmtap_inst = NULL;</span><br><span> static char *vty_ip = "127.0.0.1";</span><br><span> unsigned short vty_port = 4247;</span><br><span style="color: hsl(0, 100%, 40%);">-int debug_set = 0;</span><br><span> char *config_dir = NULL;</span><br><span> int use_mncc_sock = 0;</span><br><span> int daemonize = 0;</span><br><span>@@ -142,8 +139,7 @@</span><br><span>                    vty_port = atoi(optarg);</span><br><span>                     break;</span><br><span>               case 'd':</span><br><span style="color: hsl(0, 100%, 40%);">-                       log_parse_category_mask(stderr_target, optarg);</span><br><span style="color: hsl(0, 100%, 40%);">-                 debug_set = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                        log_parse_category_mask(osmo_stderr_target, optarg);</span><br><span>                         break;</span><br><span>               case 'D':</span><br><span>                    daemonize = 1;</span><br><span>@@ -214,20 +210,15 @@</span><br><span>       srand(time(NULL));</span><br><span> </span><br><span>       INIT_LLIST_HEAD(&ms_list);</span><br><span style="color: hsl(0, 100%, 40%);">-  log_init(&log_info, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-  stderr_target = log_target_create_stderr();</span><br><span style="color: hsl(0, 100%, 40%);">-     log_add_target(stderr_target);</span><br><span style="color: hsl(0, 100%, 40%);">-  log_set_all_filter(stderr_target, 1);</span><br><span> </span><br><span>    l23_ctx = talloc_named_const(NULL, 1, "layer2 context");</span><br><span>   /* TODO: measure and choose a proper pool size */</span><br><span>    msgb_talloc_ctx_init(l23_ctx, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   handle_options(argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+   /* Init default stderr logging */</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_init_logging2(l23_ctx, &log_info);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!debug_set)</span><br><span style="color: hsl(0, 100%, 40%);">-         log_parse_category_mask(stderr_target, debug_default);</span><br><span style="color: hsl(0, 100%, 40%);">-  log_set_log_level(stderr_target, LOGL_DEBUG);</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_options(argc, argv);</span><br><span> </span><br><span>      if (gsmtap_ip) {</span><br><span>             gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1);</span><br><span>@@ -287,6 +278,7 @@</span><br><span>       }</span><br><span> </span><br><span>        l23_app_exit();</span><br><span style="color: hsl(120, 100%, 40%);">+       log_fini();</span><br><span> </span><br><span>      talloc_free(config_file);</span><br><span>    talloc_free(config_dir);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10021">change 10021</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/10021"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I231ac9987ff3c13fafcd272b7d9aae3938ab5972 </div>
<div style="display:none"> Gerrit-Change-Number: 10021 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>