cyrusdb_skiplist: no xsyslog in 3.2

elliefm · Mar 8, 2024 · 5737fa6 · 5737fa6
1 parent da0ca3c
commit 5737fa6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cassandane/Cassandane/Cyrus/CyrusDB.pm b/cassandane/Cassandane/Cyrus/CyrusDB.pm
@@ -303,7 +303,7 @@ sub test_recover_skipstamp
     if ($self->{instance}->{have_syslog_replacement}) {
         my $syslog = join "\n", $self->{instance}->getsyslog();
         $self->assert_matches(qr/skipstamp is missing/, $syslog);
-        $self->assert_matches(qr/DBERROR: skipstamp/, $syslog);
+        $self->assert_matches(qr/skipstamp unreadable/, $syslog);
     }
 
     # shut down, enable recover, and restart
@@ -323,7 +323,7 @@ sub test_recover_skipstamp
 
         # cyrus processes should not whinge about missing skipstamp file
         $self->assert_does_not_match(qr/skipstamp is missing/, $syslog);
-        $self->assert_does_not_match(qr/DBERROR: skipstamp/, $syslog);
+        $self->assert_does_not_match(qr/skipstamp unreadable/, $syslog);
     }
 }
 

diff --git a/lib/cyrusdb_skiplist.c b/lib/cyrusdb_skiplist.c
@@ -272,15 +272,15 @@ static int myinit(const char *dbdir, int myflags)
         r = fd = open(sfile, O_RDONLY, 0644);
         if (r == -1 && errno == ENOENT) {
             /* tell the admin what they need to do! */
-            xsyslog(LOG_INFO, "skipstamp is missing, have you run `ctl_cyrusdb -r`?",
-                              "filename=<%s>", sfile);
+            syslog(LOG_INFO, "%s is missing, have you run `ctl_cyrusdb -r`?",
+                             sfile);
         }
 
         if (r != -1) r = retry_read(fd, &net32_time, 4);
 
         if (r == -1) {
-            xsyslog(LOG_ERR, "DBERROR: skipstamp unreadable, assuming the worst",
-                             "filename=<%s>", sfile);
+            syslog(LOG_ERR, "DBERROR: %s unreadable, assuming the worst",
+                            sfile);
             /* "assuming the worst" means recovery will run for every skiplist
              * database every time it's opened, because we can't determine that
              * it doesn't need it.