Skip to content

Commit

Permalink
Merge pull request #481 from cPholloway/RE-404
Browse files Browse the repository at this point in the history
Do not log output of Imunify license check
  • Loading branch information
toddr authored Jul 25, 2024
2 parents 5294d94 + ec76555 commit 2ef7a18
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion elevate-cpanel
Original file line number Diff line number Diff line change
Expand Up @@ -1438,7 +1438,7 @@ EOS
return unless -x Elevate::Constants::IMUNIFY_AGENT;

my $agent_bin = Elevate::Constants::IMUNIFY_AGENT;
my $out = $self->ssystem_capture_output( $agent_bin, 'version', '--json' );
my $out = $self->ssystem_hide_and_capture_output( $agent_bin, 'version', '--json' );
my $raw_data = join "\n", @{ $out->{stdout} };
my $license_data = eval { Cpanel::JSON::Load($raw_data) } // {};

Expand Down
2 changes: 1 addition & 1 deletion lib/Elevate/Blockers/Imunify.pm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sub _check_imunify_license ($self) {
return unless -x Elevate::Constants::IMUNIFY_AGENT;

my $agent_bin = Elevate::Constants::IMUNIFY_AGENT;
my $out = $self->ssystem_capture_output( $agent_bin, 'version', '--json' );
my $out = $self->ssystem_hide_and_capture_output( $agent_bin, 'version', '--json' );
my $raw_data = join "\n", @{ $out->{stdout} };
my $license_data = eval { Cpanel::JSON::Load($raw_data) } // {};

Expand Down
2 changes: 1 addition & 1 deletion t/blocker-Imunify.t
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ my $imunify = $cpev->get_blocker('Imunify');
my @cmds;
my @stdout;
$cpev_mock->redefine(
ssystem_capture_output => sub ( $, @args ) {
ssystem_hide_and_capture_output => sub ( $, @args ) {
push @cmds, [@args];
return { status => 0, stdout => \@stdout, stderr => [] };
},
Expand Down

0 comments on commit 2ef7a18

Please sign in to comment.