Changeset 1950

Timestamp:

04/17/08 17:50:50 (22 months ago)

Author:

mpaschal

Message:

Check in MT::Tool helper
Convert report-slow-requests and upgrade tools to use MT::Tool
BugzID: 67410

Location:

branches/release-35

Files:

• lib/MT/Tool.pm (added)
• tools/report-slow-request (modified) (3 diffs)
• tools/upgrade (modified) (4 diffs)

branches/release-35/tools/report-slow-request

@@ -7 +7 @@
 # $Id$
 
+package MT::Tool::ReportSlowRequest;
 use strict;
 
 use lib "./lib";
+use base qw( MT::Tool );
 
-use Getopt::Long qw/:config no_ignore_case/;
 use List::Util qw( min );
 use Time::HiRes qw( time );
@@ -18 +19 @@
 use Data::Dumper;
 
-GetOptions(
-    'day=s'    => \my ($arg_day),
-    'logdir=s' => \my ($arg_logdir),
-    'sample=i' => \my ($arg_sample),
-    'slow=i'   => \my ($arg_slow),
-    'debug'    => \my ($arg_debug),
-    'dump'     => \my ($arg_dump),
-);
+my ($arg_day, $arg_logdir, $arg_sample, $arg_slow, $arg_debug, $arg_dump);
 
-$arg_slow ||= 2;
-
-my $proc = MT::Util::LogProcessor->new(
-    {
-        debug        => $arg_debug,
-        logdir       => $arg_logdir || '.',
-        sample       => $arg_sample,
-        day          => $arg_day || 'yesterday',
-        file_pattern => 'pl-\d{8}.log',
-    }
-);
-
-my %stash = ( today => $proc->day );
-my ( $total_records, $elapsed ) = $proc->process_log_files(
-    sub {
-        my ($rec) = @_;
-
-        my $secs = int $rec->{time_total};
-
-        my $bucket = $secs > 10 ? 10 : $secs;
-        $stash{by_seconds}[$bucket]++;
-
-        $stash{total_requests}++;
-
-        if ( $secs > $arg_slow - 1 ) {
-            push @{ $stash{slow} }, $rec;
-        }
-    }
-);
-
-printf "Processed %d records in %.02f seconds; speed: %.02f recs/sec\n",
-  $total_records, $elapsed, $total_records / ( $elapsed || 1 )
-  if $arg_debug;
-
-for my $bucket ( 0 .. $#{ $stash{by_seconds} } ) {
-    my $count = $stash{by_seconds}[$bucket] || 0;
-    $stash{restime_histogram}[$bucket] = {
-        count => $count,
-        range => $bucket == 10
-        ? '10+ sec'
-        : $bucket . '-' . ( $bucket + 1 ) . 's',
-        percent => int( $count / $stash{total_requests} * 100 ) || 1,
+sub help {
+    return q{
+        --logdir <dir>    Look for logs in directory <dir>. By default, logs
+                          in the current directory are analyzed.
+        --sample <num>    ?
+        --slow <secs>     Number of seconds after which a request is listed
+                          as one of the slowest. By default, requests over 2
+                          seconds are considered the slowest.
+        --day <name>      The name of the day to examine; either 'today',
+                         'yesterday', or a date in the format YYYY-MM-DD.
+        --debug           Enable debugging output.
+        --dump            ?
     };
 }
 
-$stash{slow} =
-  [ sort { $b->{time_total} <=> $a->{time_total} } @{ $stash{slow} || [] } ];
+sub usage {
+}
 
-report( \%stash );
+sub options {
+    return (
+        'logdir=s' => \$arg_logdir,
+        'sample=i' => \$arg_sample,
+        'slow=i'   => \$arg_slow,
+        'day=s'    => \$arg_day,
+        'debug'    => \$arg_debug,
+        'dump'     => \$arg_dump,
+    );
+}
+
+sub main {
+    my $class = shift;
+    my ($verbose) = $class->SUPER::main(@_);
+
+    $arg_slow ||= 2;
+
+    my $proc = MT::Util::LogProcessor->new(
+        {
+            debug        => $arg_debug,
+            logdir       => $arg_logdir || '.',
+            sample       => $arg_sample,
+            day          => $arg_day || 'yesterday',
+            file_pattern => 'pl-\d{8}.log',
+        }
+    );
+
+    my %stash = ( today => $proc->day );
+    my ( $total_records, $elapsed ) = $proc->process_log_files(
+        sub {
+            my ($rec) = @_;
+
+            my $secs = int $rec->{time_total};
+
+            my $bucket = $secs > 10 ? 10 : $secs;
+            $stash{by_seconds}[$bucket]++;
+
+            $stash{total_requests}++;
+
+            if ( $secs > $arg_slow - 1 ) {
+                push @{ $stash{slow} }, $rec;
+            }
+        }
+    );
+
+    printf "Processed %d records in %.02f seconds; speed: %.02f recs/sec\n",
+      $total_records, $elapsed, $total_records / ( $elapsed || 1 )
+      if $arg_debug;
+
+    for my $bucket ( 0 .. $#{ $stash{by_seconds} } ) {
+        my $count = $stash{by_seconds}[$bucket] || 0;
+        $stash{restime_histogram}[$bucket] = {
+            count => $count,
+            range => $bucket == 10
+            ? '10+ sec'
+            : $bucket . '-' . ( $bucket + 1 ) . 's',
+            percent => int( $count / $stash{total_requests} * 100 ) || 1,
+        };
+    }
+
+    $stash{slow} =
+      [ sort { $b->{time_total} <=> $a->{time_total} } @{ $stash{slow} || [] } ];
+
+    report( \%stash );
+}
 
 sub report {
@@ -100 +128 @@
     }
 }
+
+__PACKAGE__->main() unless caller;
+
+1;
+

branches/release-35/tools/upgrade

@@ -7 +7 @@
 # $Id$
 
+package MT::Tool::Upgrade;
 use strict;
 
-use Getopt::Long;
+use lib  qw( extlib lib );
+use base qw( MT::Tool );
+
 use Carp qw(confess);
-GetOptions("dryrun", \my($dryrun), "name:s", \my($name), "sql", \my($sqlonly));
-
-use lib 'extlib';
-use lib 'lib';
-
-use MT;
 use MT::Upgrade;
 
-my $mt = new MT(Config => 'mt.cfg') or die MT->errstr;
+sub usage { '[--dryrun] [--sql] [--name <name>]' }
 
-MT->add_callback('MT::Upgrade::SQL', 1, undef, \&sql_cb) if $sqlonly;
+sub help {
+    return q{
+        Installs or upgrades a database to the current MT schema.
 
-$dryrun = 1 if $sqlonly;
-
-if (!$sqlonly) {
-    print "upgrade -- A command line tool for upgrading the schema for Movable Type.\n";
-    print "(Non-destructive mode)\n" if $dryrun;
+        --dryrun         Determine the upgrade steps required without
+                         executing any changes.
+        --sql            Report the SQL that would be performed instead
+                         of executing it.
+        --name <name>    The author as whom to perform the upgrade steps.
+                         Required when performing an upgrade (not at
+                         initial install).
+    };
 }
 
-my $install;
-my $driver = MT::Object->driver;
-if (!$driver || !$driver->table_exists('MT::Author')) {
-    $install = 1;
+my ($dryrun, $name, $sqlonly);
+
+sub options {
+    return (
+        'dryrun!' => \$dryrun,
+        'sql!'    => \$sqlonly,
+        'name=s'  => \$name,
+    );
 }
 
-unless ($install || $name) {
-    print "Please set username to set superuser at upgrading.  cf: upgrade --name Melody\n";
-    exit;
-}
 
-my $author_id;
-if (!$install && $name) {
-   require MT::BasicAuthor;
-   my $a = MT::BasicAuthor->load({name => $name});
-   die "Not found user $name:" . MT::BasicAuthor->errstr if !$a;
-   $author_id = $a->id || 0;
-}
+sub main {
+    my $class = shift;
+    my ($verbose) = $class->SUPER::main(@_);
 
-my $updated = MT::Upgrade->do_upgrade(App => 'main', 
-                                      DryRun => $dryrun,
-                                      Install => $install,
-                                      SuperUser => $author_id,
-                                      CLI => 1,
-                                      );
+    if ($sqlonly) {
+        $dryrun = 1;
+        MT->add_callback('MT::Upgrade::SQL', 1, undef, \&sql_cb);
+    }
+    else {
+        print "upgrade -- A command line tool for upgrading the schema for Movable Type.\n";
+        print "(Non-destructive mode)\n" if $dryrun;
+    }
 
-if ($install) {
-    print "Installation complete.\n";
-} else {
-    print "Upgrade complete!\n" if !$dryrun && $updated;
-    print "Your schema is up to date already.\n" if defined $updated && !$updated;
+    my $install;
+    my $driver = MT::Object->driver;
+    if (!$driver || !$driver->table_exists('MT::Author')) {
+        $install = 1;
+    }
+
+    unless ($install || $name) {
+        print "Please set username to set superuser at upgrading.  cf: upgrade --name Melody\n";
+        exit;
+    }
+
+    my $author_id;
+    if (!$install && $name) {
+        require MT::BasicAuthor;
+        my $a = MT::BasicAuthor->load({name => $name})
+            or die "Not found user $name:" . MT::BasicAuthor->errstr;
+        $author_id = $a->id;
+    }
+
+    my $updated = MT::Upgrade->do_upgrade(
+        App       => __PACKAGE__, 
+        DryRun    => $dryrun,
+        Install   => $install,
+        SuperUser => $author_id,
+        CLI       => 1,
+    );
+
+    if ($install) {
+        print "Installation complete.\n";
+    } else {
+        print "Upgrade complete!\n" if !$dryrun && $updated;
+        print "Your schema is up to date already.\n" if defined $updated && !$updated;
+    }
 }
 
@@ -68 +96 @@
     print "\t* " . $msg . "\n" unless $sqlonly;
 }
+
 sub error {
     my $pkg = shift;
@@ -73 +102 @@
     confess $err;
 }
+
 sub sql_cb {
     my $cb = shift;
@@ -78 +108 @@
     print "$stmt\n";
 }
+
+
+__PACKAGE__->main() unless caller;
+
+1;
+