Adding upstream version 1.18.0.upstream/1.18.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 23 insertions, 9 deletions

diff --git a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in
index 5b8b50a67..7aa48cbdd 100644
--- a/collectors/python.d.plugin/python.d.plugin.in
+++ b/collectors/python.d.plugin/python.d.plugin.in
@@ -1,7 +1,21 @@
 #!/usr/bin/env bash
 '''':;
-exec "$(command -v python || command -v python3 || command -v python2 ||
-echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" # '''
+pybinary=$(which python || which python3 || which python2)
+filtered=()
+for arg in "$@"
+do
+    case $arg in
+        -p*) pybinary=${arg:2}
+              shift 1          ;;
+        *)  filtered+=("$arg") ;;
+    esac
+done
+if [ "$pybinary" = "" ]
+then
+    echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM"
+    exit 1
+fi
+exec "$pybinary"  "$0" "${filtered[@]}" # '''
 
 # -*- coding: utf-8 -*-
 # Description:
@@ -197,7 +211,7 @@ class ModuleConfig:
         return [v for v in self.config if isinstance(self.config.get(v), dict)]
 
     def single_job(self):
-        return [self.create_job(self.name)]
+        return [self.create_job(self.name, self.config)]
 
     def multi_job(self):
         return [self.create_job(n, self.config[n]) for n in self.job_names()]
@@ -574,16 +588,16 @@ class Plugin:
                 try:
                     job.init()
                 except Exception as error:
-                    self.log.warning("{0}[{1}] : unhandled exception on init : {2}, skipping the job",
-                                     job.module_name, job.real_name, repr(error))
+                    self.log.warning("{0}[{1}] : unhandled exception on init : {2}, skipping the job".format(
+                                     job.module_name, job.real_name, repr(error)))
                     job.status = JOB_STATUS_DROPPED
                     continue
 
             try:
                 ok = job.check()
             except Exception as error:
-                self.log.warning("{0}[{1}] : unhandled exception on check : {2}, skipping the job",
-                                 job.module_name, job.real_name, repr(error))
+                self.log.warning("{0}[{1}] : unhandled exception on check : {2}, skipping the job".format(
+                                 job.module_name, job.real_name, repr(error)))
                 job.status = JOB_STATUS_DROPPED
                 continue
             if not ok:
@@ -595,8 +609,8 @@ class Plugin:
             try:
                 job.create()
             except Exception as error:
-                self.log.error("{0}[{1}] : unhandled exception on create : {2}, skipping the job",
-                               job.module_name, job.real_name, repr(error))
+                self.log.warning("{0}[{1}] : unhandled exception on create : {2}, skipping the job".format(
+                               job.module_name, job.real_name, repr(error)))
                 job.status = JOB_STATUS_DROPPED
                 continue