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

Merge branch 'ent-5240-9303-bloqueos-discovery' of brutus.artica.es:artica/pandorafms into ent-5240-9303-bloqueos-discovery

This commit is contained in:
fbsanchez 2020-01-02 11:03:22 +01:00
parent 154b0c367f a3fdf4007d
commit e48b41b7e7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1447,7 +1447,7 @@ sub cloud_scan($) {
} else { } else {
# Unrecognized task type. # Unrecognized task type.
call('message', 'Unrecognized task type', 1); $self->call('message', 'Unrecognized task type', 1);
$self->call('update_progress', -1); $self->call('update_progress', -1);
return; return;
} }
@ -1469,7 +1469,7 @@ sub cloud_scan($) {
if (!$cloudObj) { if (!$cloudObj) {
# Failed to initialize, check Cloud credentials or anything. # Failed to initialize, check Cloud credentials or anything.
call('message', 'Unable to initialize PandoraFMS::Recon::Cloud::'.$type, 3); $self->call('message', 'Unable to initialize PandoraFMS::Recon::Cloud::'.$type, 3);
} else { } else {
# Let Cloud object manage scan. # Let Cloud object manage scan.
@ -1581,7 +1581,7 @@ sub app_scan($) {
$type = 'SAP'; $type = 'SAP';
} else { } else {
# Unrecognized task type. # Unrecognized task type.
call('message', 'Unrecognized task type', 1); $self->call('message', 'Unrecognized task type', 1);
$self->call('update_progress', -1); $self->call('update_progress', -1);
return; return;
} }
@ -1607,7 +1607,7 @@ sub app_scan($) {
$self->{'c_network_percent'} = 0; $self->{'c_network_percent'} = 0;
# Send message # Send message
call('message', 'Checking target ' . $target, 10); $self->call('message', 'Checking target ' . $target, 10);
# Force target acquirement. # Force target acquirement.
$self->{'task_data'}->{'dbhost'} = $target; $self->{'task_data'}->{'dbhost'} = $target;
@ -1633,7 +1633,7 @@ sub app_scan($) {
# Verify if object is connected. If cannot connect to current target # Verify if object is connected. If cannot connect to current target
# return with module. # return with module.
if (!$obj->is_connected()) { if (!$obj->is_connected()) {
call('message', 'Cannot connect to target ' . $target, 3); $self->call('message', 'Cannot connect to target ' . $target, 3);
$global_percent += $global_step; $global_percent += $global_step;
$self->{'c_network_percent'} = 90; $self->{'c_network_percent'} = 90;
@ -1739,7 +1739,7 @@ sub deploy_scan($) {
if (!$deployer) { if (!$deployer) {
# Failed to initialize, check Cloud credentials or anything. # Failed to initialize, check Cloud credentials or anything.
call('message', 'Unable to initialize PandoraFMS::Recon::Deployer', 3); $self->call('message', 'Unable to initialize PandoraFMS::Recon::Deployer', 3);
} else { } else {
# Let deployer object manage scan. # Let deployer object manage scan.