tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2014-02-25 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* include/javascript/pandora_events.js
	include/ajax/events.php: Change command timeouts in responses
	from 10 to 9 seconds to avoid problems in certain systems. Add
	little feedback when command reach timeout time



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2014-02-25 12:38:53 +00:00
parent 842e7f9fed
commit 91310bd03e
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2014-02-25 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_events.js
include/ajax/events.php: Change command timeouts in responses
from 10 to 9 seconds to avoid problems in certain systems. Add
little feedback when command reach timeout time
2014-02-20 Miguel de Dios <miguel.dedios@artica.es> 2014-02-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/fields_manager.php: added the id column in the * godmode/agentes/fields_manager.php: added the id column in the

2
pandora_console/include/ajax/events.php
View File

@ -132,7 +132,7 @@ if ($perform_event_response) {
$timeout_bin = '/usr/bin/timeout'; $timeout_bin = '/usr/bin/timeout';
break; break;
} }
echo system($timeout_bin . ' 10 '.io_safe_output($command).' 2>&1'); echo system($timeout_bin . ' 9 '.io_safe_output($command).' 2>&1');
return; return;
} }

9
pandora_console/include/javascript/pandora_events.js
View File

@ -353,8 +353,13 @@ function perform_response(target) {
timeout: 10000, timeout: 10000,
dataType: 'html', dataType: 'html',
success: function (data) { success: function (data) {
var out = data.replace(/[\n|\r]/g, "<br>"); if (data == '') {
$('#response_out').html(out); $('#response_out').html('<i>No output</i>');
}
else {
var out = data.replace(/[\n|\r]/g, "<br>");
$('#response_out').html(out);
}
$('#response_loading_command').hide(); $('#response_loading_command').hide();
$('#re_exec_command').show(); $('#re_exec_command').show();
} }