aws-debug environment bugfix

bissim · Apr 30, 2020 · 7bafe3a · 7bafe3a
1 parent d968e5f
commit 7bafe3a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/compiler/org.xtext.FLY.parent/org.xtext.FLY/src/org/xtext/generator/FLYGenerator.xtend b/compiler/org.xtext.FLY.parent/org.xtext.FLY/src/org/xtext/generator/FLYGenerator.xtend
@@ -1418,6 +1418,29 @@ def deployFileOnCloud(VariableDeclaration dec,long id) {
 							});
 						}
 						'''
+				case "aws-debug":
+					return '''
+						__sqs_«element.environment.name».createQueue(new CreateQueueRequest("termination-«element.target.name»-"+__id_execution+"-«func_ID»"));
+						LinkedTransferQueue<String> __termination_«element.target.name»_ch  = new LinkedTransferQueue<String>();
+						final String __termination_«element.target.name»_url = __sqs_«element.environment.name».getQueueUrl("termination-«element.target.name»-"+__id_execution+"-«func_ID»").getQueueUrl();
+						for(int __i=0;__i< (Integer)__fly_environment.get("«local»").get("nthread");__i++){ 
+							__thread_pool_«local».submit(new Callable<Object>() {
+								@Override
+								public Object call() throws Exception {
+									while(__wait_on_termination_«element.target.name») {
+										ReceiveMessageRequest __recmsg = new ReceiveMessageRequest(__termination_«element.target.name»_url).
+												withWaitTimeSeconds(1).withMaxNumberOfMessages(10);
+										ReceiveMessageResult __res = __sqs_«element.environment.name».receiveMessage(__recmsg);
+										for(Message msg : __res.getMessages()) { 
+											__termination_«element.target.name»_ch.put(msg.getBody());
+											__sqs_«element.environment.name».deleteMessage(__termination_«element.target.name»_url, msg.getReceiptHandle());
+										}
+									}
+									return null;
+								}
+							});
+						}
+						'''
 				case "azure":
 					return '''
 						«element.environment.name».createQueue("termination-«element.target.name»-"+__id_execution+"-«func_ID»");

diff --git a/compiler/org.xtext.FLY.parent/org.xtext.FLY/src/org/xtext/generator/FLYGeneratorPython.xtend b/compiler/org.xtext.FLY.parent/org.xtext.FLY/src/org/xtext/generator/FLYGeneratorPython.xtend
@@ -1494,7 +1494,7 @@ class FLYGeneratorPython extends AbstractGenerator {
 	
 	services:
 	 localstack:
-	   image: localstack/localstack:latest
+	   image: localstack/localstack:0.9.6
 	   ports:
 	     - '4567-4593:4567-4593'
 	     - '\${PORT_WEB_UI-8080}:\${PORT_WEB_UI-8080}'

diff --git a/compiler/org.xtext.FLY.parent/org.xtext.FLY/src/org/xtext/scoping/FLYScopeProvider.xtend b/compiler/org.xtext.FLY.parent/org.xtext.FLY/src/org/xtext/scoping/FLYScopeProvider.xtend
@@ -27,7 +27,7 @@ import java.util.Arrays
  */
 class FLYScopeProvider extends AbstractFLYScopeProvider {
 
-	var list_environment = new ArrayList<String>(Arrays.asList("smp","aws","azure"));
+	var list_environment = new ArrayList<String>(Arrays.asList("smp","aws-debug","aws","azure"));
 	override getScope(EObject context, EReference reference) {
 
 		val pBlock = getParentBlock(context)