bug fixes

Author: litnimax

.gitignore

@@ -9,4 +9,4 @@ docker-compose.override.yml
 deploy/ansible-deployment
 odoo/src/odoo
 # Ignore .conf files from local bound conainer folder
-asterisk/etc/asterisk/
+asterisk/etc/asterisk/*.conf

asterisk/Dockerfile

@@ -1,16 +1,26 @@
-# vim:set ft=dockerfile:
-FROM litnimax/alpine-asterisk
+FROM alpine:edge
 
-ENV maintainer [email protected]
-
-RUN apk update && \
-    apk add supervisor git python py2-pip py2-tornado py2-setproctitle py2-gevent py2-requests py2-paho-mqtt
+RUN apk update && apk upgrade && \
+    apk add supervisor git python py2-pip py2-tornado py2-setproctitle \
+    py2-gevent py2-requests py2-paho-mqtt \
+    asterisk asterisk-odbc asterisk-sample-config asterisk-sounds-en asterisk-sounds-moh asterisk-srtp
 
 #Install optional tools
-RUN apk add tcpdump ethtool vlan iftop ngrep bash vim screen tmux mosquitto-clients
+RUN apk add tcpdump ethtool vlan iftop ngrep bash vim screen tmux mosquitto-clients curl
+
+# grab dockerize for generation of the configuration file and wait on postgres
+RUN curl https://github.com/jwilder/dockerize/releases/download/v0.6.0/dockerize-alpine-linux-amd64-v0.6.0.tar.gz -L | tar xz -C /usr/local/bin
 
 RUN mkdir /var/log/supervisor
 
-COPY ./ /
+# Asterisk conf templates
+COPY ./etc/ /etc/
+COPY ./services /services/
 
 RUN pip install -r /services/requirements.txt
+
+COPY ./docker-entrypoint.sh /
+
+EXPOSE 5060/udp 8088 5038
+
+ENTRYPOINT ["/docker-entrypoint.sh"]

asterisk/etc/supervisord.conf

@@ -29,12 +29,12 @@ directory=/services
 command=python asterisk_helper.py
 redirect_stderr=true
 
-[program:ami_broker]
-directory=/services
-command=python ami_broker.py
-redirect_stderr=true
-
-[program:stasis_apps]
-directory=/services
-command=python stasis_apps.py
-redirect_stderr=true
+#[program:ami_broker]
+#directory=/services
+#command=python ami_broker.py
+#redirect_stderr=true
+
+#[program:stasis_apps]
+#directory=/services
+#command=python stasis_apps.py
+#redirect_stderr=true

asterisk/services/mqtt_client.py

@@ -1,4 +1,5 @@
 import json
+import logging
 import paho.mqtt.client as mqtt
 import re
 import socket
@@ -12,13 +13,13 @@
 MQTT_KEEPALIVE_INTERVAL = 45
 HOSTNAME = socket.gethostname()
 
+logging.basicConfig(level=logging.INFO)
 
-
-class Client():
+class Client:
 
     def __init__(self):
         self.uid = os.environ.get('UID') or '{}'.format(uuid.getnode())
-        print 'UID: ' + self.uid
+        logging.info('UID: ' + self.uid)
         self.mqtt_client = mqtt.Client(client_id=self.uid)
         self.mqtt_client.on_connect = self.on_connect
         self.mqtt_client.on_message = self.on_message
@@ -27,57 +28,63 @@ def __init__(self):
         self.mqtt_client.on_log = self.on_log
         # Subscribe to myself
         self.mqtt_client.connect(MQTT_HOST, MQTT_PORT, MQTT_KEEPALIVE_INTERVAL)
-        self.mqtt_client.subscribe('/asterisk/' + self.uid + '/#', 0)
+        self.mqtt_client.subscribe('asterisk/' + self.uid + '/#', 0)
         self.mqtt_client.loop_forever()
 
 
-
     def on_connect(self, client, userdata, flags, rc):
-        print("rc: " + str(rc))
+        logging.info("rc: " + str(rc))
 
 
     def on_message(self, client, userdata, msg):
-        print(msg.info, msg.dup, msg.mid, msg.qos, msg.retain, msg.state, msg.timestamp, msg.topic)
-        found = re.search('^/asterisk/{}/(.+)$'.format(self.uid), msg.topic)
+        logging.info('Topic: {}, Dup: {}, Mid: {}, QoS: {}, Retain: {}, '
+                     'State: {}, Info: {}'.format(msg.topic, msg.dup, msg.mid,
+                                    msg.qos, msg.retain, msg.state, msg.info))
+        found = re.search('^asterisk/{}/(.+)$'.format(self.uid), msg.topic)
         if not found:
-            print('Error: topic {} not understood.'.format(msg.topic))
+            logging.error('Error: topic {} not understood.'.format(msg.topic))
+            return
         event_handler = getattr(self, 'on_' + found.group(1), self.handler_not_found)
         event_handler(client, userdata, msg)
 
+
     def on_publish(self, client, obj, mid):
-        print("mid: " + str(mid))
+        logging.info("mid: " + str(mid))
 
 
     def on_subscribe(self, client, obj, mid, granted_qos):
-        print("Subscribed: " + str(mid) + " " + str(granted_qos))
+        logging.info("Subscribed: " + str(mid) + " " + str(granted_qos))
 
 
     def on_log(self, client, obj, level, string):
-        print(string)
+        logging.info(string)
 
 
     def handler_not_found(self, client, userdata, msg):
-        print 'Topic {} handler not found.'.format(msg.topic)
+        logging.error('Topic {} handler not found.'.format(msg.topic))
 
 
     def _extract_message(self, payload):
         try:
             msg = json.loads(payload)
             return msg
         except ValueError as e:
-            print(e.message, ': ', payload)
+            logging.error(e.message, ': ', payload)
 
 
     def on_file(self, client, userdata, msg):
         data = self._extract_message(msg.payload)
         file_name = data.get('FileName')
         dest_folder = data.get('DestinationFolder')
         filename = os.path.join(dest_folder, file_name)
-        print 'Updating file %s' % filename
+        logging.info('Updating file %s' % filename)
         with open(filename, 'w') as f:
             f.write(data.get('Content'))
 
 
+    def on_sip_reload(self, client, userdata, msg):
+        logging.info('SIP reload')
+
 
 # Initiate MQTT Client
 mqttc = Client()

asterisk/services/requirements.txt

@@ -4,7 +4,7 @@ odoorpc
 py-Asterisk
 terminado
 
-#next dependencies are installed with aline's apk but left here for reference
-#gevent
-#requests
-#setproctitle
+# Next dependencies are installed with aline's apk but left here for reference
+# gevent
+# requests
+# setproctitle

broker/Dockerfile

@@ -2,9 +2,8 @@ FROM alpine:edge
 
 ENV maintainer [email protected]
 
-RUN apk add --no-cache bash mosquitto
+RUN apk add --no-cache bash mosquitto mosquitto-clients
 
 EXPOSE 1883
 
 CMD ["/usr/sbin/mosquitto", "-v"]
-

odoo/local-src/asterisk_base/models/server.py

@@ -115,7 +115,7 @@ def sync_conf(self, conf):
             conf.filename,
             conf.server.name,
             broker_host))
-        topic = '/asterisk/' + self.uid + '/file'
+        topic = 'asterisk/' + self.uid + '/file'
         msg = {
             'Content': conf.content,
             'FileName': conf.filename,