Changeset 3886 for trunk/tools

Timestamp:

06/19/09 04:11:07 (5 months ago)

Author:

fumiakiy

Message:

Merged fringale down to trunk. "svn merge -r 3460:3877 http://code.sixapart.com/svn/movabletype/branches/fringale ."

Files:

• trunk/tools/run-periodic-tasks (modified) (5 diffs)

trunk/tools/run-periodic-tasks

@@ -9 +9 @@
 use strict;
 
-use lib 'lib', '../lib';
+use lib 'lib', '../lib', 'extlib', '../extlib';
 
 my $daemonize = 0;
@@ -18 +18 @@
 my $scoreboard;
 my $randomize_jobs = 0;
-my $trace_objects = 0;
+my $trace_objects  = 0;
 
 require Getopt::Long;
@@ -30 +30 @@
     "leak"         => \$trace_objects,
 );
+require MT::TheSchwartz;
 
-if ( $trace_objects ) {
+if ($trace_objects) {
     require Devel::Leak::Object;
-    Devel::Leak::Object->import( qw{ GLOBAL_bless } );
+    Devel::Leak::Object->import(qw{ GLOBAL_bless });
 }
 
+my $proc_process_table = eval {
+    require Proc::ProcessTable;
+    1;
+};
+
+$@ = undef;
+
 my %cfg;
-$cfg{verbose} = $verbose;
+$cfg{verbose}    = $verbose;
 $cfg{scoreboard} = $scoreboard;
 $cfg{prioritize} = 1;
-$cfg{randomize} = $randomize_jobs;
+$cfg{randomize}  = $randomize_jobs;
 
 require MT::Bootstrap;
@@ -46 +54 @@
 
 my $mt = MT->new() or die MT->errstr;
+if ( defined(MT->config('RPTProcessCap')) && $proc_process_table ) {
+    my $t = new Proc::ProcessTable;
+    my $rpt_count;
+    foreach my $p ( @{ $t->table } ) {
+        my $cmd = $p->cmndline;
+        if ( $cmd =~ /^perl/ && $cmd =~ /run-periodic-tasks/ ) {
+            $rpt_count += 1;
+        }
+    }
+    if ( $rpt_count > MT->config('RPTProcessCap') ) {
+        $rpt_count = $rpt_count - 1;    # Don't report this RPT
+        die "$rpt_count processes already running; cancelling RPT launch\n";
+    }
+}
 
-$mt->{vtbl} = { };
-$mt->{is_admin} = 0;
-$mt->{template_dir} = 'cms';
-$mt->{user_class} = 'MT::Author';
+if ( MT->config('RPTFreeMemoryLimit') ) {
+    my $limit = MT->config('RPTFreeMemoryLimit');
+    if ( $limit and ! MT::TheSchwartz::_has_enough_swap($limit) ) {
+        die
+            "Free memory below RPT limit; cancelling RPT launch\n";
+    }
+}
+if ( MT->config('RPTFreeSwapLimit') ) {
+    my $swaplimit = MT->config('RPTSwapMemoryLimit');
+    if ( $swaplimit and ! MT::TheSchwartz::_has_enough_swap($swaplimit) ) {
+        die
+            "Free swap memory below RPT limit; cancelling RPT launch\n";
+    }
+}
+
+$mt->{vtbl}                 = {};
+$mt->{is_admin}             = 0;
+$mt->{template_dir}         = 'cms';
+$mt->{user_class}           = 'MT::Author';
 $mt->{plugin_template_path} = 'tmpl';
-$mt->run_callbacks('init_app', $mt);
+$mt->run_callbacks( 'init_app', $mt );
 
 my $client = eval {
@@ -61 +98 @@
     $c;
 };
-if ((my $error = $@) && $verbose) {
+if ( ( my $error = $@ ) && $verbose ) {
     print STDERR "Error initializing TheSchwartz: $error\n";
 }
 
-if ($daemonize && $client) {
+if ( $daemonize && $client ) {
     $client->work_periodically($sleep);
-} else {
+}
+else {
+
     # First, run periodic tasks
     $mt->run_tasks();