Author: Lars Michelsen <[email protected]>
Date: Thu Jul 12 09:56:30 2012 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Thu Jul 12 09:56:30 2012 +0200
Set default http_timeout value to 10
---
ChangeLog | 1 +
etc/nagvis.ini.php-sample | 4 ++--
share/server/core/classes/GlobalMainCfg.php | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7f32ead..68f301e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
1.7b3
Core
* Allowing empty lines in main configuration sections now
+ * Set default http_timeout value to 10
* Bugfix: Suppressing debug messages in non debug mode
* Bugfix: Better catching of exceptions on nested maps
* Bugfix: Map configs can be edited using the GUI even in case of source
errors
diff --git a/etc/nagvis.ini.php-sample b/etc/nagvis.ini.php-sample
index f40a3e3..05f0d53 100644
--- a/etc/nagvis.ini.php-sample
+++ b/etc/nagvis.ini.php-sample
@@ -55,8 +55,8 @@
; The proxy url to be used in NagVis can be configured here. One possible value
; is "tcp://127.0.0.1:8080".
;http_proxy=""
-; Set the timeout (in seconds) for outbound HTTP requests
-;http_timeout=5
+; Set the timeout (in seconds) for outbound HTTP requests (for example geomap
requests)
+;http_timeout=10
;
; Defines which translations of NagVis are available to the users
;language_available="de_DE,en_US,es_ES,fr_FR,pt_BR"
diff --git a/share/server/core/classes/GlobalMainCfg.php
b/share/server/core/classes/GlobalMainCfg.php
index bf3edb6..c17714a 100644
--- a/share/server/core/classes/GlobalMainCfg.php
+++ b/share/server/core/classes/GlobalMainCfg.php
@@ -110,7 +110,7 @@ class GlobalMainCfg {
),
'http_timeout' => array(
'must' => 1,
- 'default' => 5,
+ 'default' => 10,
'match' => MATCH_INTEGER,
),
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
