Changeset 490

Timestamp:

04/09/13 15:18:00 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak RPC to run as FastCGI, and add another config option to control
the number of requests to handle before respawning

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• dns-rpc.cgi (modified) (3 diffs)

trunk/DNSDB.pm

@@ -166 +166 @@
                 log_failures    => 1,   # log all evarthing by default
                 perpage         => 15,
+                maxfcgi         => 100, # reasonable default?
         );
 
@@ -1338 +1339 @@
       # RPC options
       $config{rpcmode}          = $1 if /^rpc_mode\s*=\s*(socket|HTTP|XMLRPC)\s*$/i;
+      $config{maxfcgi}          = $1 if /^max_fcgi_requests\s*=\s*(\d+)\s*$/i;
       if (my ($tmp) = /^rpc_iplist\s*=\s*(.+)/i) {
         my @ips = split /[,\s]+/, $tmp;

trunk/dns-rpc.cgi

@@ -24 +24 @@
 # don't remove!  required for GNU/FHS-ish install from tarball
 use lib '.';    ##uselib##
-
-use DNSDB;      # note we're not importing subs;  this lets us (ab)use the same sub names here for convenience
-use Data::Dumper;
-
+use DNSDB;
+
+use FCGI;
 #use Frontier::RPC2;
 use Frontier::Responder;
@@ -69 +68 @@
 };
 
-my $res = Frontier::Responder->new(
+my $reqcnt = 0;
+
+while (FCGI::accept >= 0) {
+  my $res = Frontier::Responder->new(
         methods => $methods
         );
 
-# "Can't do that" errors
-if (!$dnsdb) {
-  print "Content-type: text/xml\n\n".$res->{_decode}->encode_fault(5, $msg);
-  exit;
-}
-##fixme:  fail on missing rpcuser/rpcsystem args
-
-print $res->answer;
+  # "Can't do that" errors
+  if (!$dnsdb) {
+    print "Content-type: text/xml\n\n".$res->{_decode}->encode_fault(5, $dnsdb->err);
+  } else {
+    print $res->answer;
+  }
+  last if $reqcnt++ > $dnsdb->{maxfcgi};
+} # while FCGI::accept
+
 
 exit;
@@ -88 +91 @@
 ##
 
-# Utility subs
+# Check RPC ACL
 sub _aclcheck {
   my $subsys = shift;