tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP: Backup upload

This commit is contained in:
Jose Gonzalez 2020-11-13 11:43:26 +01:00
parent 08cc67696a
commit 98205973a5
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -547,9 +547,9 @@ class DiscoveryTaskList extends HTML
);
} else if ($task['review_mode'] == DISCOVERY_STANDARD) {
if ($task['type'] === DISCOVERY_APP_VMWARE) {
if ($task['status'] <= 0) {
if ($task['status'] <= 0 && $task['utimestamp'] != 0) {
$data[5] == __('Done');
} else if ($task['status'] > 0 && $task['utimestamp'] == 0) {
} else if ($task['status'] > 0) {
$data[5] == __('Pending');
} else {
$data[5] == __('Not started');

3
pandora_server/lib/PandoraFMS/DiscoveryServer.pm
View File

@ -387,7 +387,7 @@ sub exec_recon_script ($$$) {
} else {
$ent_script = 1;
}
logger($pa_config, 'Executing command args: ' . $command . ' ' . $args, 1);
if (-x $command) {
my $exec_output = `$command $args`;
logger($pa_config, "Execution output: \n". $exec_output, 10);
@ -1769,7 +1769,6 @@ sub PandoraFMS::Recon::Base::update_progress ($$) {
my $stats = {};
eval {
logger($self->{'pa_config'}, 'Task data: '.Dumper($self->{'task_data'}->{'description'}).' - summary es '.Dumper($self->{'summary'}), 3);
local $SIG{__DIE__};
if (defined($self->{'summary'}) && $self->{'summary'} ne '') {
$stats->{'summary'} = $self->{'summary'};

2
pandora_server/lib/PandoraFMS/Recon/Base.pm
View File

@ -1898,7 +1898,7 @@ sub scan($) {
# 1%
$self->call('update_progress', 1);
logger($self->{'pa_config'}, 'Tipo de Task: '.$self->{'task_data'}->{'type'});
if (defined($self->{'task_data'})) {
if ( $self->{'task_data'}->{'type'} == DISCOVERY_APP_MYSQL
|| $self->{'task_data'}->{'type'} == DISCOVERY_APP_ORACLE