Browse Source

switch to Cpanel::JSON::XS

Byron Jones 6 years ago
parent
commit
8dc8b65a0e
4 changed files with 6 additions and 8 deletions
  1. 1 2
      cpanfile
  2. 1 1
      lib/LogBot/JobQueue.pm
  3. 1 1
      lib/LogBot/Web/Stats.pm
  4. 3 4
      logbot-nightly

+ 1 - 2
cpanfile

@@ -1,4 +1,5 @@
 # cpanm --verbose --local-lib ~/perl5/ --notest --installdeps .
+requires 'Cpanel::JSON::XS', '==4.06';
 requires 'DBD::SQLite', '==1.54';
 requires 'DBI', '==1.636';
 requires 'Date::Parse', '==2.30';
@@ -8,8 +9,6 @@ requires 'EV', '==4.22';
 requires 'IO::Socket::SSL', '==2.049';
 requires 'IO::Socket::Socks', '==0.74';
 requires 'IO::Socket::Timeout', '==0.32';
-requires 'JSON', '==2.94';
-requires 'JSON::XS', '==3.03';
 requires 'List::MoreUtils', '==0.419';
 requires 'List::Util', '==1.50';
 requires 'Memcached::libmemcached', '==1.001801';

+ 1 - 1
lib/LogBot/JobQueue.pm

@@ -7,8 +7,8 @@ use warnings;
 use FindBin qw( $RealBin );
 use lib "$RealBin/lib";
 
+use Cpanel::JSON::XS qw( decode_json encode_json );
 use File::Basename qw( basename );
-use JSON::XS qw( decode_json encode_json );
 use LogBot::Util qw( path_for slurp spurt timestamp );
 use Time::HiRes qw( time );
 

+ 1 - 1
lib/LogBot/Web/Stats.pm

@@ -4,8 +4,8 @@ use v5.10;
 use strict;
 use warnings;
 
+use Cpanel::JSON::XS qw( decode_json );
 use DateTime ();
-use JSON::XS qw( decode_json );
 use List::Util qw( uniq );
 use LogBot::Database qw( dbh );
 use LogBot::Util qw( commify file_for plural slurp time_to_datetimestr );

+ 3 - 4
logbot-nightly

@@ -13,9 +13,8 @@ BEGIN {
     $ENV{CRON} = !$ENV{DEBUG};
 }
 
+use Cpanel::JSON::XS qw( encode_json );
 use DateTime ();
-use JSON     ();
-use JSON::XS qw( encode_json );
 use List::Util qw( any );
 use LogBot::Config qw( find_config load_all_configs load_config reload_config save_config );
 use LogBot::Database qw( dbh replace_sql_placeholders );
@@ -159,8 +158,8 @@ sub generate_hours_meta {
     my $json = {
         data  => \@data,
         lines => {
-            show => JSON::true,
-            fill => JSON::true,
+            show => \1,
+            fill => \1,
         },
     };
     spurt($output_file, encode_json($json));