Changeset 587

Timestamp:

01/17/13 16:19:47 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Minor cleanup of current RPC calls for consistency. See #1.

• $rpc_url is checked in _rpc(), don't (usually) need to check before calling
• remove a debugging print
• remove a dangling local Frontier::Client object

File:

• trunk/cgi-bin/IPDB.pm (modified) (4 diffs)

trunk/cgi-bin/IPDB.pm

@@ -121 +121 @@
     $errstr = $@;
     $errstr =~ s/Fault returned from XML RPC Server, fault code 4: error executing RPC `dnsdb.$rpcsub'\.\s//;
-print "error!  $errstr\n";
   }
   $rpccount++;
@@ -381 +380 @@
           state => 1,   # could make them globally configurable maybe
         );
-        if (!_rpc('addRDNS', %rpcargs)) {
+        if ($rpc_url && !_rpc('addRDNS', %rpcargs)) {
           push @fails, ("$subzone" => $errstr);
         }
@@ -1034 +1033 @@
 
     # now we do the DNS dance for netblocks, if we have an RPC server to do it with.
-    _rpc('addOrUpdateRevRec', cidr => "$args{cidr}", name => $args{rdns}, rpcuser => $args{user})
-      if $rpc_url;
+    _rpc('addOrUpdateRevRec', cidr => "$args{cidr}", name => $args{rdns}, rpcuser => $args{user});
 
     return ('OK', 'OK');
@@ -1495 +1493 @@
 
   if ($rpc_url) {
-    # Make an object to represent the XML-RPC server.
-    my $server = Frontier::Client->new(url => $rpc_url, debug => 0);
-    my $result;
-
     # Use the first /16 or /24, rather than dithering over which sub-/14 /16
     # or sub-/19 /24 to retrieve - it's the least-wrong way to do things.