enforce 30s a default timeout

fusioninventory · Feb 6, 2015 · cb34e23 · cb34e23
1 parent 5450303
commit cb34e23
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/etc/agent.cfg b/etc/agent.cfg
@@ -27,7 +27,7 @@ ca-cert-file =
 no-ssl-check = 0
 
 # connection timeout, in seconds
-timeout = 180
+timeout = 30
 
 # user name for server authentication
 user =

diff --git a/etc/agent.cfg.pod b/etc/agent.cfg.pod
@@ -66,7 +66,7 @@ Disables server SSL certificate validation. The default is 0 (false).
 
 =item B<timeout>
 
-Specifies a timeout, in seconds, for server connections.
+Specifies the timeout, in seconds, for server connections. The default is 30.
 
 =back
 
@@ -200,7 +200,8 @@ Enables scanning user profiles for softwares. The default is 0
 
 =item B<timeout>
 
-Specifies the timeout for task modules execution.
+Specifies the timeout, in seconds, for individual inventory components
+execution. The default is 30.
 
 =item B<additional-content>
 

diff --git a/lib/FusionInventory/Agent/Config.pm b/lib/FusionInventory/Agent/Config.pm
@@ -223,7 +223,7 @@ sub new {
         },
         http => {
             'proxy'              => undef,
-            'timeout'            => 180,
+            'timeout'            => 30,
             'ca-cert-dir'        => undef,
             'ca-cert-file'       => undef,
             'no-ssl-check'       => 0,
@@ -246,7 +246,7 @@ sub new {
         inventory => {
             'disable'            => 0,
             'additional-content' => undef,
-            'timeout'            => 180,
+            'timeout'            => 30,
             'no-category'        => [],
             'scan-homedirs'      => 0,
             'scan-profiles'      => 0,

diff --git a/resources/config/default b/resources/config/default
@@ -27,7 +27,7 @@ ca-cert-file =
 no-ssl-check = 0
 
 # connection timeout, in seconds
-timeout = 180
+timeout = 30
 
 # user name for server authentication
 user =

diff --git a/t/agent/config.t b/t/agent/config.t
@@ -20,7 +20,7 @@ my %config = (
             'ca-cert-dir'  => undef,
             'password'     => undef,
             'proxy'        => undef,
-            'timeout'      => 180,
+            'timeout'      => 30,
             'user'         => undef,
         },
         httpd => {
@@ -42,7 +42,7 @@ my %config = (
             'no-category'        => [],
             'scan-homedirs'      => 0,
             'scan-profiles'      => 0,
-            'timeout'            => 180
+            'timeout'            => 30
         },
         deploy => {
             'disable' => 0,
@@ -72,7 +72,7 @@ my %config = (
             'ca-cert-dir'  => undef,
             'password'     => undef,
             'proxy'        => undef,
-            'timeout'      => 180,
+            'timeout'      => 30,
             'user'         => undef,
         },
         'httpd' => {
@@ -92,7 +92,7 @@ my %config = (
             'disable'            => 0,
             'additional-content' => undef,
             'no-category'        => [ 'printer' ],
-            'timeout'            => 180,
+            'timeout'            => 30,
             'scan-homedirs'      => 0,
             'scan-profiles'      => 0,
         },
@@ -124,7 +124,7 @@ my %config = (
             'ca-cert-dir'  => undef,
             'password'     => undef,
             'proxy'        => undef,
-            'timeout'      => 180,
+            'timeout'      => 30,
             'user'         => undef,
         },
         'httpd' => {
@@ -146,7 +146,7 @@ my %config = (
             'no-category'        => [ ],
             'scan-homedirs'      => 0,
             'scan-profiles'      => 0,
-            'timeout'            => 180,
+            'timeout'            => 30,
         },
         'deploy' => {
             'disable' => 0,
@@ -176,7 +176,7 @@ my %config = (
             'ca-cert-dir'  => undef,
             'password'     => undef,
             'proxy'        => undef,
-            'timeout'      => 180,
+            'timeout'      => 30,
             'user'         => undef,
         },
         httpd => {
@@ -228,7 +228,7 @@ my %config = (
             'ca-cert-dir'  => undef,
             'password'     => undef,
             'proxy'        => undef,
-            'timeout'      => 180,
+            'timeout'      => 30,
             'user'         => undef,
         },
         httpd => {
@@ -250,7 +250,7 @@ my %config = (
             'no-category'        => [],
             'scan-homedirs'      => 0,
             'scan-profiles'      => 0,
-            'timeout'            => 180
+            'timeout'            => 30
         },
         deploy => {
             'disable' => 0,