Adding region

ruecarlo · Nov 21, 2017 · 1cbd943 · 1cbd943
1 parent cde64ac
commit 1cbd943
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/queue_processor.py b/src/queue_processor.py
@@ -2,13 +2,20 @@
 import time
 import subprocess
 import argparse
+import os
 
-session = boto3.session.Session()
-REGION = session.region_name
 parser = argparse.ArgumentParser(description='Process some integers.')
 parser.add_argument('--queue', dest='queue',default='workshop', help='Amazon SQS')
+parser.add_argument('--region', dest='region',default=None, help='Region')
 args = parser.parse_args()
 QUEUE = args.queue
+REGION = args.region
+
+try:
+    if REGION is None:
+        REGION = os.getenv("REGION")
+except:
+    raise "Must pass region as environment variable or argument"
 
 
 sleepTime = 5

diff --git a/templates/spotlabworker.sh b/templates/spotlabworker.sh
@@ -25,4 +25,4 @@
 #	echo "Debug: "$(config.py)
 
 	echo 'Starting the worker processor'
-	python /home/ec2-user/spotlabworker/queue_processor.py > stdout.txt 2>&1
+	python /home/ec2-user/spotlabworker/queue_processor.py --region $REGION> stdout.txt 2>&1