Merge branch '162-phase-2-changes' into 'master'

Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!178
This commit is contained in:
Kendrick Chan 2018-08-15 06:15:13 +00:00
commit c66f78b32f

View file

@ -6,27 +6,26 @@ import time
import signal
import sys
import os
import logging
def sigint_handler(signal, frame):
print 'Interrupted'
sys.exit(0)
os._exit(0)
def redisLoop(apns):
def redisLoop(apns, logger):
r = redis.StrictRedis(host='localhost', port=6379, db=0)
while 1:
time.sleep(0)
data = r.brpop("apns_push", 10)
if data:
info = data[1].split('|')
print "Token: " + info[0] + " message: " + info[1]
logger.info("Token: " + info[0] + " message: " + info[1])
send_notif(apns, info[0], info[1])
def sigint_handler(signal, frame):
print 'Interrupted'
sys.exit(0)
def send_notif(apns, token_hex, message):
@ -34,17 +33,33 @@ def send_notif(apns, token_hex, message):
payload = Payload(alert=message, sound="default", badge=1)
apns.gateway_server.send_notification(token_hex, payload)
def get_logger():
logger = logging.getLogger("apns_logger")
logger.setLevel(logging.INFO)
fh = logging.FileHandler("/tmp/apns_sender.log")
fmt = '%(asctime)s - %(threadName)s - %(levelname)s - %(message)s'
formatter = logging.Formatter(fmt)
fh.setFormatter(formatter)
logger.addHandler(fh)
return logger
def main():
cert_file = "/root/ios_push_test/motoliteUserDev.pem"
apns = APNs(use_sandbox=True, cert_file=cert_file)
redisLoop(apns)
logger = get_logger()
logger.info("Starting apns_sender")
cert_file = "/root/ios_push_test/ios_prod.pem"
apns = APNs(use_sandbox=False, cert_file=cert_file)
logger.info("Starting redis loop")
redisLoop(apns, logger)
signal.signal(signal.SIGINT, sigint_handler)
#pid = "/tmp/apns_sender.pid"
#daemon = Daemonize(app="apns_sender", pid=pid, action=main)
#daemon.start()
main()
pid = "/tmp/apns_sender.pid"
daemon = Daemonize(app="apns_sender", pid=pid, action=main)
daemon.start()
#main()