<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11158">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mncc_sock.py: throw / raise exceptions from MnccSocket<br><br>Calling sys.exit() from MnccSocket's constructor could lead to<br>a situation when the main thread becomes "dead", while its child<br>threads are still working. Let's throw the exceptions towards<br>the caller, so it would be possible to handle them there.<br><br>Change-Id: I485eb86c69e74693eeae89723de27e376585f1da<br>---<br>M mncc_sock.py<br>1 file changed, 4 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/58/11158/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/mncc_sock.py b/mncc_sock.py</span><br><span>index e71a39a..0a64a81 100644</span><br><span>--- a/mncc_sock.py</span><br><span>+++ b/mncc_sock.py</span><br><span>@@ -10,7 +10,6 @@</span><br><span> # option, any later version.</span><br><span> </span><br><span> import socket</span><br><span style="color: hsl(0, 100%, 40%);">-import sys</span><br><span> import os</span><br><span> import mncc</span><br><span> import ctypes</span><br><span>@@ -122,11 +121,7 @@</span><br><span>         super(MnccSocketBase, self).__init__()</span><br><span>         self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET)</span><br><span>         print('connecting to %s' % address)</span><br><span style="color: hsl(0, 100%, 40%);">-        try:</span><br><span style="color: hsl(0, 100%, 40%);">-            self.sock.connect(address)</span><br><span style="color: hsl(0, 100%, 40%);">-        except socket.error as errmsg:</span><br><span style="color: hsl(0, 100%, 40%);">-            sys.stderr.write("%s\n" % errmsg)</span><br><span style="color: hsl(0, 100%, 40%);">-            sys.exit(1)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.sock.connect(address)</span><br><span> </span><br><span>         # Check the HELLO message</span><br><span>         self.check_hello()</span><br><span>@@ -137,15 +132,13 @@</span><br><span> </span><br><span>         # Match expected message type</span><br><span>         if msg.msg_type != mncc.MNCC_SOCKET_HELLO:</span><br><span style="color: hsl(0, 100%, 40%);">-            sys.stderr.write('Received an unknown (!= MNCC_SOCKET_HELLO) '</span><br><span style="color: hsl(120, 100%, 40%);">+            raise AssertionError('Received an unknown (!= MNCC_SOCKET_HELLO) '</span><br><span>                 'message: %s\n' % msg)</span><br><span style="color: hsl(0, 100%, 40%);">-            sys.exit(1)</span><br><span> </span><br><span>         # Match expected protocol version</span><br><span>         if msg.version != mncc.MNCC_SOCK_VERSION:</span><br><span style="color: hsl(0, 100%, 40%);">-            sys.stderr.write('MNCC protocol version mismatch '</span><br><span style="color: hsl(120, 100%, 40%);">+            raise AssertionError('MNCC protocol version mismatch '</span><br><span>                 '(0x%04x vs 0x%04x)\n' % (msg.version, mncc.MNCC_SOCK_VERSION))</span><br><span style="color: hsl(0, 100%, 40%);">-            sys.exit(1)</span><br><span> </span><br><span>         # Match expected message sizes / offsets</span><br><span>         if (msg.mncc_size != ctypes.sizeof(mncc.gsm_mncc) or</span><br><span>@@ -154,8 +147,7 @@</span><br><span>             msg.signal_offset != mncc.gsm_mncc.signal.offset or</span><br><span>             msg.emergency_offset != mncc.gsm_mncc.emergency.offset or</span><br><span>             msg.lchan_type_offset != mncc.gsm_mncc.lchan_type.offset):</span><br><span style="color: hsl(0, 100%, 40%);">-                sys.stderr.write('MNCC message alignment mismatch\n')</span><br><span style="color: hsl(0, 100%, 40%);">-                sys.exit(1)</span><br><span style="color: hsl(120, 100%, 40%);">+                raise AssertionError('MNCC message alignment mismatch\n')</span><br><span> </span><br><span>         print('Received %s' % msg)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11158">change 11158</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/11158"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: mncc-python </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I485eb86c69e74693eeae89723de27e376585f1da </div>
<div style="display:none"> Gerrit-Change-Number: 11158 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>