Merge pull request #696 from paulfantom/master

better python logging

diff --git a/python.d/apache.chart.py b/python.d/apache.chart.py
index b8ce614f1a3f7ac658d94428bf410f6af6984024..2e4d16dd379425d5d9ea32f0197a4b70565817cb 100644 (file)
--- a/python.d/apache.chart.py
+++ b/python.d/apache.chart.py
@@ -7,7 +7,7 @@ from base import UrlService
 # default module values (can be overridden per job in `config`)
 # update_every = 2
 priority = 60000
-retries = 5
+retries = 60
 
 # default job configuration (overridden by python.d.plugin)
 # config = {'local': {

diff --git a/python.d/apache_cache.chart.py b/python.d/apache_cache.chart.py
index 85b0ee170ee089608f43af513a273acde0596367..cf88a6895daf707ad4f507b343404e2fefebc5f9 100644 (file)
--- a/python.d/apache_cache.chart.py
+++ b/python.d/apache_cache.chart.py
@@ -5,7 +5,7 @@
 from base import LogService
 
 priority = 60000
-retries = 5
+retries = 60
 # update_every = 3
 
 ORDER = ['cache']

diff --git a/python.d/example.chart.py b/python.d/example.chart.py
index f915117d539eebe67b83b474671b9e11f3264852..a7ce064f0a1d38a81acf3c4f54e79068b24d94ba 100644 (file)
--- a/python.d/example.chart.py
+++ b/python.d/example.chart.py
@@ -11,7 +11,7 @@ NAME = os.path.basename(__file__).replace(".chart.py", "")
 # default module values
 # update_every = 4
 priority = 90000
-retries = 7
+retries = 60
 
 
 class Service(BaseService):

diff --git a/python.d/exim.chart.py b/python.d/exim.chart.py
index 84981eadc37d021472aa0707737971e8c4b9a961..a0dfa6f9a306fe83303fb36f49a6acf3bb3c3d2f 100644 (file)
--- a/python.d/exim.chart.py
+++ b/python.d/exim.chart.py
@@ -7,7 +7,7 @@ from base import ExecutableService
 # default module values (can be overridden per job in `config`)
 # update_every = 2
 priority = 60000
-retries = 5
+retries = 60
 
 # charts order (can be overridden if you want less charts, or different order)
 ORDER = ['qemails']

diff --git a/python.d/hddtemp.chart.py b/python.d/hddtemp.chart.py
index 842004845e527fb47dd241ca884068aed990248a..487e0ad330696aa1a4eaaa0436ecab3cf1e86076 100644 (file)
--- a/python.d/hddtemp.chart.py
+++ b/python.d/hddtemp.chart.py
@@ -7,7 +7,7 @@ from base import SocketService
 # default module values (can be overridden per job in `config`)
 #update_every = 2
 priority = 60000
-retries = 5
+retries = 60
 
 # default job configuration (overridden by python.d.plugin)
 # config = {'local': {

diff --git a/python.d/mysql.chart.py b/python.d/mysql.chart.py
index 9137f6205c29367c1900b2c107342b1330ac14b8..51c3269c165f3b78bb00cae432e3cc6cade3dd73 100644 (file)
--- a/python.d/mysql.chart.py
+++ b/python.d/mysql.chart.py
@@ -24,7 +24,7 @@ except ImportError:
 # default module values (can be overridden per job in `config`)
 # update_every = 3
 priority = 90000
-retries = 7
+retries = 60
 
 # default configuration (overridden by python.d.plugin)
 # config = {

diff --git a/python.d/nginx.chart.py b/python.d/nginx.chart.py
index 8b7aab79227cbd648b4f1dba6a1e93d91e2267ed..83b1892a9ea9e2117f184eb221661196f603f310 100644 (file)
--- a/python.d/nginx.chart.py
+++ b/python.d/nginx.chart.py
@@ -7,7 +7,7 @@ from base import UrlService
 # default module values (can be overridden per job in `config`)
 # update_every = 2
 priority = 60000
-retries = 5
+retries = 60
 
 # default job configuration (overridden by python.d.plugin)
 # config = {'local': {

diff --git a/python.d/phpfpm.chart.py b/python.d/phpfpm.chart.py
index 5e5801103963afb1310c2a07795a1cbd2e411646..d1791d42eddebb021262e37a4767637329bc3486 100755 (executable)
--- a/python.d/phpfpm.chart.py
+++ b/python.d/phpfpm.chart.py
@@ -7,7 +7,7 @@ from base import UrlService
 # default module values (can be overridden per job in `config`)
 # update_every = 2
 priority = 60000
-retries = 5
+retries = 60
 
 # default job configuration (overridden by python.d.plugin)
 # config = {'local': {

diff --git a/python.d/postfix.chart.py b/python.d/postfix.chart.py
index 471d4f3fabcc277cecd936015223721e555947fa..c8eb3ee853c036abc446b4868291ee297edae55a 100644 (file)
--- a/python.d/postfix.chart.py
+++ b/python.d/postfix.chart.py
@@ -7,7 +7,7 @@ from base import ExecutableService
 # default module values (can be overridden per job in `config`)
 # update_every = 2
 priority = 60000
-retries = 5
+retries = 60
 
 # charts order (can be overridden if you want less charts, or different order)
 ORDER = ['qemails', 'qsize']

diff --git a/python.d/redis.chart.py b/python.d/redis.chart.py
index 570fa36caac827da03543451d53eb53347703f47..8268ff14dd4b2bdae8a86386b4f3051f1bbddfbb 100644 (file)
--- a/python.d/redis.chart.py
+++ b/python.d/redis.chart.py
@@ -7,7 +7,7 @@ from base import SocketService
 # default module values (can be overridden per job in `config`)
 #update_every = 2
 priority = 60000
-retries = 5
+retries = 60
 
 # default job configuration (overridden by python.d.plugin)
 # config = {'local': {

diff --git a/python.d/squid.chart.py b/python.d/squid.chart.py
index 97cf711e12d1c6eec308e179454c7836bf8a49c7..716ee9ce57bfc0aef2752e56989ca46c738a5ed9 100644 (file)
--- a/python.d/squid.chart.py
+++ b/python.d/squid.chart.py
@@ -7,7 +7,7 @@ from base import SocketService
 # default module values (can be overridden per job in `config`)
 # update_every = 2
 priority = 60000
-retries = 5
+retries = 60
 
 # charts order (can be overridden if you want less charts, or different order)
 ORDER = ['clients_net', 'clients_requests', 'servers_net', 'servers_requests']

diff --git a/python.d/tomcat.chart.py b/python.d/tomcat.chart.py
index 060331cdcc12c20ba076b4d7a2048443963fbb3a..f5316a1958fd6da7cda0acbf5f9fa7a3b754f68f 100644 (file)
--- a/python.d/tomcat.chart.py
+++ b/python.d/tomcat.chart.py
@@ -8,7 +8,7 @@ import xml.etree.ElementTree as ET  # phone home...
 # default module values (can be overridden per job in `config`)
 # update_every = 2
 priority = 60000
-retries = 5
+retries = 60
 
 # charts order (can be overridden if you want less charts, or different order)
 ORDER = ['accesses', 'volume', 'threads', 'jvm']

diff --git a/src/main.c b/src/main.c
index 16c34c72147b355441a4583ca5467d9c411aeb4d..d79bf668a6156713b1deca847fd7b7ba19e5628e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -444,6 +444,13 @@ int main(int argc, char **argv)
        // http://stackoverflow.com/questions/4554271/how-to-avoid-excessive-stat-etc-localtime-calls-in-strftime-on-linux
        setenv("TZ", ":/etc/localtime", 0);
 
+       {
+               char path[1024 + 1], *p = getenv("PATH");
+               if(!p) p = "/bin:/usr/bin";
+               snprintfz(path, 1024, "%s:%s", p, "/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin");
+               setenv("PATH", config_get("plugins", "PATH environment variable", path), 1);
+       }
+
        // cd to /tmp to avoid any plugins writing files at random places
        if(chdir("/tmp")) error("netdata: ERROR: Cannot cd to /tmp");