[svn:qpsmtpd] rev 430 - in branches/high_perf: lib/Qpsmtpd plugins

Author: msergeant
Date: Wed Jun  8 15:25:28 2005
New Revision: 430

Modified:
   branches/high_perf/lib/Qpsmtpd/ConfigServer.pm
   branches/high_perf/plugins/stats
Log:
More of the same.


Modified: branches/high_perf/lib/Qpsmtpd/ConfigServer.pm
==============================================================================
--- branches/high_perf/lib/Qpsmtpd/ConfigServer.pm	(original)
+++ branches/high_perf/lib/Qpsmtpd/ConfigServer.pm	Wed Jun  8 15:25:28 2005
@@ -157,17 +157,7 @@ sub cmd_status {
     
     if (defined &Qpsmtpd::Plugin::stats::register) {
         # Stats plugin is loaded
-        my $uptime = Qpsmtpd::Plugin::stats->uptime;
-        my $recvd  = Qpsmtpd::Plugin::stats->mails_received;
-        my $reject = Qpsmtpd::Plugin::stats->mails_rejected;
-        my $soft   = Qpsmtpd::Plugin::stats->mails_tempfailed;
-        my $rate   = Qpsmtpd::Plugin::stats->mails_per_sec;
-        $output .= sprintf("          Uptime: %0.2f sec\n".
-                            "  Mails Received: % 10d\n".
-                            "             5xx: % 10d\n".
-                            "             4xx: % 10d\n".
-                            "Mails per second: %0.2f\n",
-                                            $uptime, $recvd, $reject, $soft, $rate);
+        $output .= Qpsmtpd::Plugin::stats->get_stats;
     }
     
     my $descriptors = Danga::Socket->DescriptorMap;

Modified: branches/high_perf/plugins/stats
==============================================================================
--- branches/high_perf/plugins/stats	(original)
+++ branches/high_perf/plugins/stats	Wed Jun  8 15:25:28 2005
@@ -15,6 +15,20 @@ sub register {
     $self->register_hook('queue', 'increment_mails');
 }
 
+sub get_stats {
+    my $uptime = Qpsmtpd::Plugin::stats->uptime;
+    my $recvd  = Qpsmtpd::Plugin::stats->mails_received;
+    my $reject = Qpsmtpd::Plugin::stats->mails_rejected;
+    my $soft   = Qpsmtpd::Plugin::stats->mails_tempfailed;
+    my $rate   = Qpsmtpd::Plugin::stats->mails_per_sec;
+    return sprintf("          Uptime: %0.2f sec\n".
+                   "  Mails Received: % 10d\n".
+                   "             5xx: % 10d\n".
+                   "             4xx: % 10d\n".
+                   "Mails per second: %0.2f\n",
+                                   $uptime, $recvd, $reject, $soft, $rate);
+}
+
 sub increment_deny {
     my ($self, $tran, $plugin, $level) = @_;