diff --git a/main.py b/main.py index d2f39c3..6847618 100755 --- a/main.py +++ b/main.py @@ -85,6 +85,7 @@ def signalHandler(signum, frame): TERMINATING = True def handleSms(sms): + global CHIPINFO global DISABLE_SEM global PRODUCTS global LAST_PRODUCT @@ -92,6 +93,12 @@ def handleSms(sms): logger.info(u'Incoming SMS from: {0}; Time: {1}; Message: {2}'.format(sms.number, sms.time, sms.text)) + try: + epic_key = 'epic.msgin.gw:' + BASE_CHIPINFO + redis_client.publish(epic_key + '.message', u'{0}: {1} ({2})'.format(sms.number, sms.text, CHIPINFO)) + except: + logger.warning('Fail to publish epic message to redis') + if not xltunai.isValidSender(sms.number): logger.info('Ignoring incoming SMS from invalid sender') return @@ -166,6 +173,8 @@ def handleSms(sms): def getRequestIdByNominalDestination(nominal, destination): + global CHIPINFO + redis_key = sate24.keyByNominalDestination(CHIPINFO, nominal, destination) #return redis_client.spop(redis_key) return redis_client.rpop(redis_key)