Function worker: debug messages for sending remote messages

Author: iakkus

FunctionWorker/python/PublicationUtils.py

@@ -318,20 +318,22 @@ def _send_remote_message(self, remote_address, message_type, action_data):
         # retry 7 times, wait for 5 seconds for the connection to time out
         while retry <= 6.4:
             try:
+                action_data_str = json.dumps(action_data)
+                self._logger.debug("Sending remote message (" + message_type + ") : " + action_data_str)
                 resp = requests.post(remote_address,
                                      params={"async": 1},
                                      json={},
                                      timeout=5,
                                      headers={"x-mfn-action": message_type,
-                                              "x-mfn-action-data": json.dumps(action_data)})
+                                              "x-mfn-action-data": action_data_str})
                 break
             except Exception as exc:
                 self._logger.debug("Sending remote message (" + message_type + ") failed: " + str(exc) + "; retrying in: " + str(retry) + "s")
                 time.sleep(retry)
                 retry = retry * 2
 
         if retry > 6.4:
-            self._logger.info("Could not send remote message (" + message_type + ") due to timeouts.")
+            self._logger.debug("Could not send remote message (" + message_type + ") due to timeouts.")
 
 
     def _publish_privileged_output(self, function_output, lqcpub):

Sandbox/Makefile

@@ -26,6 +26,7 @@ clean:
 	make -C frontend clean
 	make -C ../redis clean
 	rm -rf build/*
+	rm sandbox_deployment_package.tar.gz
 
 build_thrift:
 	cd ../build_tools/thrift/$(THRIFT_VERSION)/; ./build_thrift.sh; cd -
@@ -42,10 +43,7 @@ build/SandboxAgent.tar.gz: $(SBASOURCE) $(FWSOURCE)
 	mkdir -p build
 	tar -czf $@ ../SandboxAgent
 
-build/FunctionWorker.tar.gz: \
-		$(FWSOURCE) \
-		../build_env.mk \
-		../build_tools/thrift/$(THRIFT_VERSION)/build_thrift.sh
+build/FunctionWorker.tar.gz: $(FWSOURCE) ../build_env.mk ../build_tools/thrift/$(THRIFT_VERSION)/build_thrift.sh
 	cd ../build_tools/thrift/$(THRIFT_VERSION)/; ./build_thrift.sh; cd -
 	mkdir -p build
 	docker run --user $$(id -u):$$(id -g) --rm -v $$(pwd)/../:/root -w /root $(THRIFT_IMAGE_NAME):$(THRIFT_VERSION) bash -c '\