Skip to content

Commit 030ff93

Browse files
committed
Change env defaults
1 parent 1c69738 commit 030ff93

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ services:
77
QUEUE_SERVER: "localhost:5672"
88
FILES_SERVER: "localhost:3001"
99
INPUT_QUEUE_NAME: "low_level_in"
10-
OUTPUT_QUEUE_NAME: "low_leve_out"
10+
OUTPUT_QUEUE_NAME: "low_level_out"

src/worker.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
FILES_SERVER = os.environ.get("FILES_SERVER", "localhost:3001")
1717
QUEUE_SERVER_HOST, QUEUE_SERVER_PORT = os.environ.get("QUEUE_SERVER", "localhost:5672").split(":")
18-
Q_IN = os.environ.get("INPUT_QUEUE_NAME", "vad_in")
19-
Q_OUT = os.environ.get("OUTPUT_QUEUE_NAME", "vad_out")
18+
Q_IN = os.environ.get("INPUT_QUEUE_NAME", "low_level_in")
19+
Q_OUT = os.environ.get("OUTPUT_QUEUE_NAME", "low_level_out")
2020

2121
def callback(channel, method, properties, body, args):
2222

@@ -32,7 +32,7 @@ def do_work(connection, channel, delivery_tag, body):
3232
try:
3333
print(" [x] Received %r" % body, flush=True)
3434
args = json.loads(body)
35-
file = download(args['file'], buffer=True)
35+
file = download(args['file']['name'], url="http://" + FILES_SERVER, buffer=True)
3636
result = ast.literal_eval(file.decode('utf-8'))
3737

3838
count = 0
@@ -55,14 +55,13 @@ def do_work(connection, channel, delivery_tag, body):
5555

5656
payload = bytes(str(dict_result), encoding='utf-8')
5757

58-
uploaded = upload(payload, buffer=True, mime='text/plain')
58+
uploaded = upload(payload, url="http://" + FILES_SERVER, buffer=True, mime='text/plain')
5959

6060
message = {
6161
**args,
6262
'low-level-output': uploaded
6363
}
6464

65-
# post a message on topic_segmentation queue
6665
connection_out = pika.BlockingConnection(
6766
pika.ConnectionParameters(host=QUEUE_SERVER_HOST, port=QUEUE_SERVER_PORT))
6867
channel2 = connection_out.channel()
@@ -112,7 +111,7 @@ def consume():
112111
threads = []
113112
on_message_callback = functools.partial(
114113
callback, args=(connection, threads))
115-
channel.basic_consume(queue='low_level_features',
114+
channel.basic_consume(queue=Q_IN,
116115
on_message_callback=on_message_callback)
117116
try:
118117
channel.start_consuming()

0 commit comments

Comments
 (0)