function worker to pick level from env variable LOG_LEVEL. Defaults to INFO

Author: paarijaat

FunctionWorker/python/FunctionWorker.py

@@ -187,6 +187,12 @@ def _set_args(self, args):
 
         self._should_checkpoint = args["should_checkpoint"]
 
+    def _get_loglevel(self):    
+        loglevel = logging.INFO
+        if "LOG_LEVEL" in os.environ and os.environ["LOG_LEVEL"] != None and len(str(os.environ["LOG_LEVEL"])) > 0:
+            loglevel = logging._nameToLevel.get(str(os.environ["LOG_LEVEL"]).upper(), loglevel)
+        return loglevel
+
     def _setup_loggers(self):
         global LOGGER_HOSTNAME
         global LOGGER_CONTAINERNAME
@@ -200,15 +206,16 @@ def _setup_loggers(self):
         LOGGER_WORKFLOWNAME = self._workflowname
         LOGGER_WORKFLOWID = self._workflowid
 
+        logevel = self._get_loglevel()
         self._logger = logging.getLogger(self._function_state_name)
-        self._logger.setLevel(logging.INFO)
+        self._logger.setLevel(logevel)
         self._logger.addFilter(LoggingFilter())
 
         formatter = logging.Formatter("[%(timestamp)d] [%(levelname)s] [%(hostname)s] [%(containername)s] [%(uuid)s] [%(userid)s] [%(workflowname)s] [%(workflowid)s] [%(name)s] [%(asctime)s.%(msecs)03d] %(message)s", datefmt='%Y-%m-%d %H:%M:%S')
         logfile = '/opt/mfn/logs/function_'+ self._function_state_name + '.log'
 
         hdlr = logging.FileHandler(logfile)
-        hdlr.setLevel(logging.INFO)
+        hdlr.setLevel(logevel)
         hdlr.setFormatter(formatter)
         self._logger.addHandler(hdlr)
 

FunctionWorker/python/PublicationUtils.py

@@ -319,7 +319,7 @@ def _send_remote_message(self, remote_address, message_type, action_data):
         while retry <= 6.4:
             try:
                 action_data_str = json.dumps(action_data)
-                self._logger.debug("Sending remote message (" + message_type + ") : " + action_data_str)
+                self._logger.debug(f"Sending remote message ({message_type}) to {remote_address}, data: {action_data_str}")
                 resp = requests.post(remote_address,
                                      params={"async": 1},
                                      json={},
@@ -328,12 +328,12 @@ def _send_remote_message(self, remote_address, message_type, 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")
+                self._logger.warn(f"Failed sending remote message ({message_type}) to {remote_address}, data: {action_data_str}, exception: {str(exc)}; retrying in: {str(retry)}s")
                 time.sleep(retry)
                 retry = retry * 2
 
         if retry > 6.4:
-            self._logger.debug("Could not send remote message (" + message_type + ") due to timeouts.")
+            self._logger.warn(f"Failed sending remote message ({message_type}) to {remote_address} failed, data: {action_data_str}, due to timeouts")
 
 
     def _publish_privileged_output(self, function_output, lqcpub):