<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13282">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;">openvpn: Improve logging and status information<br><br>New strings are far more comprehensive to understand the current status<br>during (re)connect to openvpn management socket.<br><br>Change-Id: Ifd0f821ed2d237740b6d3381a7190ad7058ce889<br>---<br>M src/osysmon_openvpn.c<br>1 file changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osysmon_openvpn.c b/src/osysmon_openvpn.c</span><br><span>index 148e3b8..8c95984 100644</span><br><span>--- a/src/osysmon_openvpn.c</span><br><span>+++ b/src/osysmon_openvpn.c</span><br><span>@@ -117,7 +117,7 @@</span><br><span> {</span><br><span>     struct openvpn_client *vpn = osmo_stream_cli_get_data(conn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        update_name(vpn->rem_cfg, "management interface unavailable");</span><br><span style="color: hsl(120, 100%, 40%);">+   update_name(vpn->rem_cfg, "disconnected from openvpn management socket");</span><br><span>       vpn->connected = false;</span><br><span>   talloc_free(vpn->tun_ip);</span><br><span>         talloc_free(vpn->rem_cfg->remote_host);</span><br><span>@@ -131,7 +131,7 @@</span><br><span> {</span><br><span>     struct openvpn_client *vpn = osmo_stream_cli_get_data(conn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        update_name(vpn->rem_cfg, "management interface incompatible");</span><br><span style="color: hsl(120, 100%, 40%);">+  update_name(vpn->rem_cfg, "connected to openvpn management socket");</span><br><span>    vpn->connected = true;</span><br><span> </span><br><span>        return 0;</span><br><span>@@ -149,7 +149,7 @@</span><br><span> </span><br><span>  bytes = osmo_stream_cli_recv(conn, msg);</span><br><span>     if (bytes < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-               OVPN_LOG(msg, vpn, "unable to receive message in callback\n");</span><br><span style="color: hsl(120, 100%, 40%);">+              OVPN_LOG(msg, vpn, "read on openvpn management socket failed (%d)\n", bytes);</span><br><span>      else</span><br><span>                 parse_state(msg, vpn);</span><br><span> </span><br><span>@@ -174,7 +174,7 @@</span><br><span>     if (!vpn->cfg)</span><br><span>            goto dealloc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       vpn->rem_cfg = host_cfg_alloc(vpn, "management interface unavailable", NULL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ vpn->rem_cfg = host_cfg_alloc(vpn, "connecting to openvpn management socket", NULL, 0);</span><br><span>         if (!vpn->rem_cfg)</span><br><span>                goto dealloc;</span><br><span> </span><br><span>@@ -191,7 +191,7 @@</span><br><span>      osmo_stream_cli_set_disconnect_cb(vpn->mgmt, disconnect_cb);</span><br><span> </span><br><span>  if (osmo_stream_cli_open(vpn->mgmt) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                OVPN_LOG(vpn->rem_cfg, vpn, "failed to connect to management interface\n");</span><br><span style="color: hsl(120, 100%, 40%);">+              OVPN_LOG(vpn->rem_cfg, vpn, "failed to connect to management socket\n");</span><br><span>                goto dealloc;</span><br><span>        }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13282">change 13282</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/13282"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sysmon </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ifd0f821ed2d237740b6d3381a7190ad7058ce889 </div>
<div style="display:none"> Gerrit-Change-Number: 13282 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>