Changeset 917 for branches

Timestamp:

08/14/25 10:49:59 (23 hours ago)

Author:

Kris Deugau

Message:

/branches/secondaryzones

Update _log() to handle secondary zone tag. While we're in here, update
SQL to use RETURNING instead of trying to peek at the sequence without
disturbing it.

File:

• branches/secondaryzones/DNSDB.pm (modified) (1 diff)

branches/secondaryzones/DNSDB.pm

@@ -491 +491 @@
   $args{rdns_id} = 0 if !$args{rdns_id};
   $args{domain_id} = 0 if !$args{domain_id};
+  $args{secondary_id} = 0 if !$args{secondary_id};
   $args{logparent} = 0 if !$args{logparent};
 
 ##fixme:  farm out the actual logging to different subs for file, syslog, internal, etc based on config
 #  if ($self->{log_channel} eq 'sql') {
-  $dbh->do("INSERT INTO log (domain_id,rdns_id,group_id,logparent,entry,user_id,email,name) ".
-        "VALUES (?,?,?,?,?,?,?,?)",
+  my ($log_id) = $dbh->selectrow_array(
+        "INSERT INTO log (domain_id,rdns_id,secondary_id,group_id,logparent,entry,user_id,email,name) ".
+        "VALUES (?,?,?,?,?,?,?,?,?) ".
+        "RETURNING log_id",
         undef,
-        ($args{domain_id}, $args{rdns_id}, $args{group_id}, $args{logparent}, $args{entry},
+        ($args{domain_id}, $args{rdns_id}, $args{secondary_id} $args{group_id}, $args{logparent}, $args{entry},
                 $self->{loguserid}, $self->{logusername}, $self->{logfullname}) );
 
-  my ($log_id) = $dbh->selectrow_array("SELECT currval('log_log_id_seq')");
   return $log_id;