<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11161">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">*.py: use generic logging framework instead of print()<br><br>Change-Id: I025ddae64e41319abac8e2cd2e266db83aea4a7b<br>---<br>M contrib/manual_test_server.py<br>M gsm_call_fsm.py<br>M mncc_sock.py<br>M mncc_test.py<br>M smpp_test.py<br>5 files changed, 28 insertions(+), 24 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/61/11161/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/manual_test_server.py b/contrib/manual_test_server.py</span><br><span>index 7338129..4b2b5bd 100644</span><br><span>--- a/contrib/manual_test_server.py</span><br><span>+++ b/contrib/manual_test_server.py</span><br><span>@@ -91,39 +91,39 @@</span><br><span> # Say hello and set-up a call</span><br><span> conn.send_msg(MnccMessageBuilder.build_hello())</span><br><span> conn.send_msg(MnccMessageBuilder.build_setup_ind("1234", "5000"))</span><br><span style="color: hsl(0, 100%, 40%);">-print("=> Sent hello + setup indication")</span><br><span style="color: hsl(120, 100%, 40%);">+log.info("=> Sent hello + setup indication")</span><br><span> </span><br><span> # Wait for the RTP crate.. and actknowledge it..</span><br><span> msg = conn.recv()</span><br><span> assert msg.msg_type == mncc.MNCC_RTP_CREATE</span><br><span style="color: hsl(0, 100%, 40%);">-print("<= Received request to create a RTP socket")</span><br><span style="color: hsl(120, 100%, 40%);">+log.info("<= Received request to create a RTP socket")</span><br><span> conn.send_msg(MnccMessageBuilder.build_rtp_msg(mncc.MNCC_RTP_CREATE,</span><br><span> msg.callref,</span><br><span> #socket.INADDR_LOOPBACK, 4000))</span><br><span> socket.INADDR_ANY, 4000))</span><br><span style="color: hsl(0, 100%, 40%);">-print("=> Claimed socket was created...")</span><br><span style="color: hsl(120, 100%, 40%);">+log.info("=> Claimed socket was created...")</span><br><span> </span><br><span> msg = conn.recv()</span><br><span> assert msg.msg_type == mncc.MNCC_CALL_PROC_REQ</span><br><span style="color: hsl(0, 100%, 40%);">-print("<= Received proceeding...")</span><br><span style="color: hsl(120, 100%, 40%);">+log.info("<= Received proceeding...")</span><br><span> </span><br><span> </span><br><span> </span><br><span> while True:</span><br><span> msg = conn.recv()</span><br><span> if msg.msg_type == mncc.MNCC_ALERT_REQ:</span><br><span style="color: hsl(0, 100%, 40%);">- print("=> I should alert...")</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info("=> I should alert...")</span><br><span> continue</span><br><span> if msg.msg_type == mncc.MNCC_RTP_CONNECT:</span><br><span> conn.send_msg(MnccMessageBuilder.build_rtp_msg(mncc.MNCC_RTP_CONNECT,</span><br><span> msg.callref,</span><br><span> socket.INADDR_LOOPBACK, 4000))</span><br><span style="color: hsl(0, 100%, 40%);">- print("=> I needed to connect RTP...")</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info("=> I needed to connect RTP...")</span><br><span> continue</span><br><span> if msg.msg_type == mncc.MNCC_SETUP_RSP:</span><br><span style="color: hsl(0, 100%, 40%);">- print("=> Call is connected?")</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info("=> Call is connected?")</span><br><span> conn.send_msg(MnccMessageBuilder.build_setup_cmpl_ind(msg.callref))</span><br><span> send_dtmf(msg.callref)</span><br><span> continue</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print(msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug(msg)</span><br><span>diff --git a/gsm_call_fsm.py b/gsm_call_fsm.py</span><br><span>index c62df0c..a9ad8c0 100644</span><br><span>--- a/gsm_call_fsm.py</span><br><span>+++ b/gsm_call_fsm.py</span><br><span>@@ -13,6 +13,8 @@</span><br><span> import ctypes</span><br><span> import pykka</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import logging as log</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> from fysom import Fysom</span><br><span> from mncc_sock import mncc_msg, mncc_number, mncc_rtp_msg, mncc_bridge_msg, mncc_bearer_cap</span><br><span> </span><br><span>@@ -76,7 +78,7 @@</span><br><span> return GsmCallFsm.last_callref;</span><br><span> </span><br><span> def _printstatechange(self, e):</span><br><span style="color: hsl(0, 100%, 40%);">- print '%s: event: %s, %s -> %s' % (self, e.event, e.src, e.dst)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug('%s: event: %s, %s -> %s' % (self, e.event, e.src, e.dst))</span><br><span> if self.ctrl_ref != None:</span><br><span> self.ctrl_ref.tell({'type':'call_state_change', 'called':self.called, 'old_state':e.src, 'new_state':e.dst})</span><br><span> </span><br><span>@@ -98,7 +100,7 @@</span><br><span> def _onmncc_call_conf_ind(self, e):</span><br><span> msg_in = e.args[0]</span><br><span> codec = self.find_matching_codec(msg_in.bearer_cap.speech_ver)</span><br><span style="color: hsl(0, 100%, 40%);">- print '%s: CALL-CONF.ind(selected codec = %s)' % (self, codec)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info('%s: CALL-CONF.ind(selected codec = %s)' % (self, codec))</span><br><span> # select the according lchan_mode</span><br><span> lchan_mode = codec.to_lchan_mode()</span><br><span> msg = mncc_msg(msg_type = mncc.MNCC_LCHAN_MODIFY, callref = msg_in.callref, lchan_mode = lchan_mode)</span><br><span>@@ -292,7 +294,7 @@</span><br><span> if message['type'] == 'mncc':</span><br><span> msg = message['msg']</span><br><span> if msg.callref == self.callref:</span><br><span style="color: hsl(0, 100%, 40%);">- print '%s: on_receive(mncc, %s)' % (self, msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug('%s: on_receive(mncc, %s)' % (self, msg))</span><br><span> return self._handle_mncc(msg)</span><br><span> elif message['type'] == 'start_mt_call':</span><br><span> self.start_mt_call(message['calling'], message['called'])</span><br><span>@@ -326,7 +328,7 @@</span><br><span> self.call_b.tell({'type':'start_mt_call', 'calling':self.msisdn_a, 'called':self.msisdn_b})</span><br><span> </span><br><span> def rtp_created(self, msisdn, rtp):</span><br><span style="color: hsl(0, 100%, 40%);">- print 'CallConnector:rtp_created(%s) %s' % (msisdn, rtp)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info('CallConnector:rtp_created(%s) %s' % (msisdn, rtp))</span><br><span> if self.rtp_bridge == False:</span><br><span> raise Exception('GsmCallConnector', 'rtp_created but not in RTP bridge mode')</span><br><span> if msisdn == self.msisdn_a: # A->B leg</span><br><span>@@ -345,7 +347,8 @@</span><br><span> self.mncc_act.tell({'type': 'send', 'msg': msg})</span><br><span> </span><br><span> def call_state_change(self, msisdn, old_state, new_state):</span><br><span style="color: hsl(0, 100%, 40%);">- print 'CallConnector:leg_state_change(%s) %s -> %s' % (msisdn, old_state, new_state)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug('CallConnector:leg_state_change(%s) %s -> %s'</span><br><span style="color: hsl(120, 100%, 40%);">+ % (msisdn, old_state, new_state))</span><br><span> if msisdn == self.msisdn_a: # A->B leg</span><br><span> self.state_a = new_state</span><br><span> elif msisdn == self.msisdn_b: # B->A leg</span><br><span>@@ -353,7 +356,7 @@</span><br><span> if self.rtp_bridge == False and self.state_a == 'ACTIVE' and self.state_b == 'ACTIVE':</span><br><span> self.bridge_legs()</span><br><span> if self.state_a == 'NULL' and self.state_b == 'NULL':</span><br><span style="color: hsl(0, 100%, 40%);">- print 'Both A and B in state NULL -> Terminating'</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info('Both A and B in state NULL -> Terminating')</span><br><span> self.stop()</span><br><span> </span><br><span> def on_receive(self, message):</span><br><span>diff --git a/mncc_sock.py b/mncc_sock.py</span><br><span>index 0a64a81..009a476 100644</span><br><span>--- a/mncc_sock.py</span><br><span>+++ b/mncc_sock.py</span><br><span>@@ -9,6 +9,7 @@</span><br><span> # Licensed under GNU General Public License, Version 2 or at your</span><br><span> # option, any later version.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+import logging as log</span><br><span> import socket</span><br><span> import os</span><br><span> import mncc</span><br><span>@@ -120,14 +121,14 @@</span><br><span> def __init__(self, address = '/tmp/bsc_mncc'):</span><br><span> super(MnccSocketBase, self).__init__()</span><br><span> self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET)</span><br><span style="color: hsl(0, 100%, 40%);">- print('connecting to %s' % address)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info('Connecting to %s' % address)</span><br><span> self.sock.connect(address)</span><br><span> </span><br><span> # Check the HELLO message</span><br><span> self.check_hello()</span><br><span> </span><br><span> def check_hello(self):</span><br><span style="color: hsl(0, 100%, 40%);">- print('Waiting for HELLO message...')</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug('Waiting for HELLO message...')</span><br><span> msg = self.recv()</span><br><span> </span><br><span> # Match expected message type</span><br><span>@@ -149,7 +150,7 @@</span><br><span> msg.lchan_type_offset != mncc.gsm_mncc.lchan_type.offset):</span><br><span> raise AssertionError('MNCC message alignment mismatch\n')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print('Received %s' % msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info('Received %s' % msg)</span><br><span> </span><br><span> class MnccSocketServer(object):</span><br><span> def __init__(self, address = '/tmp/bsc_mncc'):</span><br><span>diff --git a/mncc_test.py b/mncc_test.py</span><br><span>index 9222605..508c5be 100755</span><br><span>--- a/mncc_test.py</span><br><span>+++ b/mncc_test.py</span><br><span>@@ -13,7 +13,7 @@</span><br><span> from mncc_sock import MnccSocket</span><br><span> from thread import start_new_thread</span><br><span> import pykka</span><br><span style="color: hsl(0, 100%, 40%);">-import logging</span><br><span style="color: hsl(120, 100%, 40%);">+import logging as log</span><br><span> import signal, sys, time</span><br><span> import readline, code</span><br><span> </span><br><span>@@ -26,7 +26,7 @@</span><br><span> def on_receive(self, message):</span><br><span> if message['type'] == 'send':</span><br><span> msg = message['msg']</span><br><span style="color: hsl(0, 100%, 40%);">- print 'MnccActor TxMNCC %s' % msg</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug('MnccActor TxMNCC %s' % msg)</span><br><span> mncc_sock.send(msg)</span><br><span> else:</span><br><span> raise Exception('mncc', 'MnccActor Received unhandled %s' % message)</span><br><span>@@ -36,10 +36,10 @@</span><br><span> while 1:</span><br><span> msg = mncc_sock.recv()</span><br><span> if msg.is_frame():</span><br><span style="color: hsl(0, 100%, 40%);">- print("Dropping traffic frame: %s" % msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.warning("Dropping traffic frame: %s" % msg)</span><br><span> continue</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print "MnccActor RxMNCC %s, broadcasting to Call FSMs" % msg</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug("MnccActor RxMNCC %s, broadcasting to Call FSMs" % msg)</span><br><span> # we simply broadcast to all calls</span><br><span> pykka.ActorRegistry.broadcast({'type': 'mncc', 'msg': msg}, GsmCallFsm)</span><br><span> </span><br><span>@@ -48,7 +48,7 @@</span><br><span> pykka.ActorRegistry.stop_all()</span><br><span> sys.exit(0)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-logging.basicConfig(level = logging.DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+log.basicConfig(level = log.DEBUG,</span><br><span> format = "%(levelname)s %(filename)s:%(lineno)d %(message)s")</span><br><span> </span><br><span> signal.signal(signal.SIGINT, sigint_handler)</span><br><span>diff --git a/smpp_test.py b/smpp_test.py</span><br><span>index ad7d4dc..71eba91 100755</span><br><span>--- a/smpp_test.py</span><br><span>+++ b/smpp_test.py</span><br><span>@@ -17,7 +17,7 @@</span><br><span> def send_message(dest, string):</span><br><span> parts, encoding_flag, msg_type_flag = smpplib.gsm.make_parts(string)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print 'Sending SMS "%s" to %s' % (string, dest)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info('Sending SMS "%s" to %s' % (string, dest))</span><br><span> for part in parts:</span><br><span> pdu = client.send_message(</span><br><span> source_addr_ton=smpplib.consts.SMPP_TON_INTL,</span><br><span>@@ -32,7 +32,7 @@</span><br><span> esm_class=smpplib.consts.SMPP_MSGMODE_FORWARD,</span><br><span> registered_delivery=False,</span><br><span> )</span><br><span style="color: hsl(0, 100%, 40%);">- print(pdu.sequence)</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug(pdu.sequence)</span><br><span> </span><br><span> </span><br><span> client = smpplib.client.Client('127.0.0.1', 2775)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11161">change 11161</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/11161"/><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: I025ddae64e41319abac8e2cd2e266db83aea4a7b </div>
<div style="display:none"> Gerrit-Change-Number: 11161 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>