summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Code/download_and_map.py13
-rw-r--r--Code/test_redis_publish.py9
2 files changed, 13 insertions, 9 deletions
diff --git a/Code/download_and_map.py b/Code/download_and_map.py
index 5ad19cf..6372248 100644
--- a/Code/download_and_map.py
+++ b/Code/download_and_map.py
@@ -392,11 +392,14 @@ def publish(mapped_data_directory):
redis_password = os.getenv('REDIS_PASSWORD', '123456')
r = redis.Redis(host=redis_host, port=6379, password=redis_password, db=0)
for fname in glob.glob('%s/*_quant.txt' % (mapped_data_directory.rstrip('/'))):
- file_basename = os.path.basename(fname)
- with open(fname, 'r') as f:
- data = f.read()
- r.publish(REDIS_CHANNEL, json.dumps({'filename':file_basename, 'data':data}))
- time.sleep(1)
+ try:
+ file_basename = os.path.basename(fname)
+ with open(fname, 'r') as f:
+ data = f.read()
+ r.publish(REDIS_CHANNEL, json.dumps({'filename':file_basename, 'data':data}))
+ time.sleep(1)
+ except Exception as e:
+ r.publish(REDIS_CHANNEL, json.dumps({'filename':'REDIS_ERROR.txt', 'data':str(e)}))
## main
diff --git a/Code/test_redis_publish.py b/Code/test_redis_publish.py
index b33ceed..937833f 100644
--- a/Code/test_redis_publish.py
+++ b/Code/test_redis_publish.py
@@ -1,13 +1,14 @@
import os, redis, json, time
from configure import REDIS_CHANNEL
-def publish():
+def publish(number):
redis_host = os.getenv('REDIS_HOST', '127.0.0.1')
redis_password = os.getenv('REDIS_PASSWORD', '123456')
r = redis.Redis(host=redis_host, port=6379, password=redis_password, db=0)
- r.publish(REDIS_CHANNEL, json.dumps({'filename':'a.txt', 'data':'123'}))
+ r.publish(REDIS_CHANNEL, json.dumps({'filename':'a.txt', 'data':str(number)}))
+n = 0
while True:
- publish()
+ publish(n)
time.sleep(3)
-
+ n += 1