Ticket #86: controlchan.diff

controlchan

@@ -39 +39 @@
 my $lastctl = 0;
 my $use_syslog = 0;
 my $debug = 0;
+my $delayed = 1;
+my $delay = 3;
+my @actions = ();
 
 # setup logging ###########################################################
 # do not log to syslog if stderr is connected to a console
@@ -55 +58 @@
 }
 logmsg('starting');
 
+sub delayedprocess {
+    logmsg("Processing the queue (" . scalar(@actions) . " messages in queue)");
+    my $t = 0;
+    if(scalar(@actions) > 1) {
+        $t = 1;
+        system($inn::newsbin."/ctlinnd throttle 'controlchan processing'");
+    }
+    while(my $p = shift(@actions)) {
+        my $subname = shift(@$p);
+        my $token = shift(@$p);
+        my $subfind = \&$subname;
+        #my @p = ($subfind, \@progparams, $sender, $replyto, $sitepath,
+        #         $action, $logname, $approved, \@headers, \@body);
+        #logmsg("$subname, " . join(' ', @progparams)
+        #    . " $sender $replyto $token, $sitepath, $action"
+        #    . ($logname ? "=$logname" : '') .", $approved");
+        logmsg("$subname, " . join(' ', @{$$p[0]})
+             . " $$p[1] $$p[2] $$p[3] $token, $$p[4], $$p[6]"
+             . ($$p[7] ? "=$$p[7]" : '') .", $$p[8]");
+        &$subfind(@$p);
+    }
+    if($t) {
+        system($inn::newsbin."/ctlinnd go 'controlchan processing'");
+    }
+}
+
+
+if ($delayed) {
+    $SIG{ALRM} = \&delayedprocess;
+}
+
 # load modules from the control directory #################################
 opendir(CTL, $inn::controlprogs)
     or logdie("Cannot open $inn::controlprogs: $!", 'crit');
@@ -156 +190 @@
     }
 
     my $approved = $hdr{approved} ? 1 : 0;
-    logmsg("$subname, " . join(' ', @progparams)
-        . " $sender $replyto $token, $sitepath, $action"
-        . ($logname ? "=$logname" : '') .", $approved");
 
-    &$subfind(\@progparams, $sender, $replyto, $sitepath,
-        $action, $logname, $approved, \@headers, \@body);
+    if(!$delayed) {
+        logmsg("$subname, " . join(' ', @progparams)
+            . " $sender $replyto $token, $sitepath, $action"
+            . ($logname ? "=$logname" : '') .", $approved");
+        &$subfind(\@progparams, $sender, $replyto, $sitepath,
+            $action, $logname, $approved, \@headers, \@body);
+    } else {
+        my @p = ($subname, $token, \@progparams, $sender, $replyto, $sitepath,
+                 $action, $logname, $approved, \@headers, \@body);
+        push(@actions, [ @p ]);
+        if(scalar(@actions) > 50) {
+            alarm 0;
+            &delayedprocess;
+        } else {
+            logmsg("$subname, delayed for $delay seconds (" . scalar(@actions) . " messages in queue)");
+            alarm $delay;
+        }
+    }
 }
 
 closelog() if $use_syslog;