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

Do require not eval for delayed loading.

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-15 12:31:38 -07:00
parent 5be7c252b8
commit 7950b0d7cd
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/pt-agent
View File

@@ -765,7 +765,7 @@ sub override {
package Percona::WebAPI::Representation; package Percona::WebAPI::Representation;
eval { eval {
use JSON; require JSON;
}; };
require Exporter; require Exporter;
@@ -844,8 +844,8 @@ use English qw(-no_match_vars);
use constant PTDEBUG => $ENV{PTDEBUG} || 0; use constant PTDEBUG => $ENV{PTDEBUG} || 0;
eval { eval {
use LWP; require LWP;
use JSON; require JSON;
}; };
use Scalar::Util qw(blessed); use Scalar::Util qw(blessed);
@@ -5239,17 +5239,18 @@ my $exit_status = 0;
my $state = {}; my $state = {};
my $exit_on_signals = 0; my $exit_on_signals = 0;
my $logger; my $logger;
my %deps = ( my %deps = (
'DBD::mysql' => [qw(DBD::mysql libdbd-mysql-perl ...)], 'DBD::mysql' => [qw(DBD::mysql libdbd-mysql-perl perl-DBD-MySQL)],
'JSON' => [qw(JSON libjson-perl ...)], 'JSON' => [qw(JSON libjson-perl perl-JSON)],
'LWP' => [qw(LWP libwww-perl ...)], 'LWP' => [qw(LWP libwww-perl perl-libwww-perl)],
'IO::Socket::SSL'=> [qw(IO::Socket::SSL libio-socket-ssl ...)], 'IO::Socket::SSL'=> [qw(IO::Socket::SSL libio-socket-ssl perl-IO-Socket-SSL)],
); );
# Will check this later. # Will check this later.
eval { eval {
use JSON qw(decode_json); require JSON;
JSON->import(qw(decode_json));
}; };
sub main { sub main {

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

@@ -27,8 +27,8 @@ use English qw(-no_match_vars);
use constant PTDEBUG => $ENV{PTDEBUG} || 0; use constant PTDEBUG => $ENV{PTDEBUG} || 0;
eval { eval {
use LWP; require LWP;
use JSON; require JSON;
}; };
use Scalar::Util qw(blessed); use Scalar::Util qw(blessed);

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

@@ -21,7 +21,7 @@
package Percona::WebAPI::Representation; package Percona::WebAPI::Representation;
eval { eval {
use JSON; require JSON;
}; };
require Exporter; require Exporter;