percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-06 20:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call JSON::decode() explicitly.

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-15 13:00:15 -07:00
parent ccb2a7e7c7
commit e825b233f5
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/pt-agent
View File

@@ -920,7 +920,7 @@ sub get {
}
my $resource = eval {
decode_json($self->response->content);
JSON::decode_json($self->response->content);
};
if ( $EVAL_ERROR ) {
warn sprintf "Error decoding resource: %s: %s",
@@ -5251,7 +5251,6 @@ my %deps = (
# Will check this later.
eval {
require JSON;
JSON->import(qw(decode_json));
};
sub main {
@@ -5605,7 +5604,7 @@ sub load_local_agent {
my $agent_file = $lib_dir . "/agent";
if ( -f $agent_file ) {
$logger->info("Reading saved Agent from $agent_file") unless $quiet;
my $agent_hashref = decode_json(slurp($agent_file));
my $agent_hashref = JSON::decode_json(slurp($agent_file));
$agent = Percona::WebAPI::Resource::Agent->new(%$agent_hashref);
if ( !$agent->uuid ) {
$logger->fatal("No UUID for Agent in $agent_file.");
@@ -7183,7 +7182,7 @@ sub load_service {
my $service_obj;
eval {
my $service_hash = decode_json(slurp($service_file));
my $service_hash = JSON::decode_json(slurp($service_file));
$service_obj = Percona::WebAPI::Resource::Service->new(%$service_hash);
};
if ( $EVAL_ERROR ) {
@@ -7636,7 +7635,7 @@ sub agent_status {
# Get the agent's info.
if ( -f "$lib_dir/agent" ) {
my $agent = decode_json(slurp("$lib_dir/agent"));
my $agent = JSON::decode_json(slurp("$lib_dir/agent"));
foreach my $attrib ( qw(uuid hostname username) ) {
$logger->info("Agent $attrib: " . ($agent->{$attrib} || ''));
}
@@ -7659,7 +7658,7 @@ sub agent_status {
SERVICE:
foreach my $service_file ( glob "$lib_dir/services/*" ) {
my $service = eval {
decode_json(slurp($service_file));
JSON::decode_json(slurp($service_file));
};
if ( $EVAL_ERROR ) {
$logger->warning("$service_file is corrupt");

2
lib/Percona/WebAPI/Client.pm
View File

@@ -105,7 +105,7 @@ sub get {
# The resource should be represented as JSON, decode it.
my $resource = eval {
decode_json($self->response->content);
JSON::decode_json($self->response->content);
};
if ( $EVAL_ERROR ) {
warn sprintf "Error decoding resource: %s: %s",