Skip to contentSkip to conversation

tabled: drop double prefixing

PATCH In review Pete Zaitcev 2 participants 2 messages Apr 18, 2010 – Apr 19, 2010 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 9/12 tabled: drop double prefixing

On Fedora 14, the following is seen in syslog:

Apr 17 19:58:52 niphredil tabled: tabled: connecting to site
 hitlain.zaitcev.lan:8083: No route to host
Apr 17 19:58:56 niphredil tabled: tabled: DB_ENV->rep_elect:WARNING:
 nvotes (1) is sub-majority with nsites (2)

Drop the extra prefix, it only wastes screen space.

---
 lib/tdb.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit eb60e6e5c97fe316d23b9b21ba020bca924e879e

Author: Master <[email protected]>
Date:   Sat Apr 17 20:31:56 2010 -0600

Fix double tagging in syslog.

lib/tdb.c +6 -1
index cd65371..12ff231 100644
@@ -38,7 +38,12 @@ enum {
 
 static void db4syslog(const DB_ENV *dbenv, const char *errpfx, const char *msg)
 {
-	syslog(LOG_WARNING, "%s: %s", errpfx, msg);
+	/*
+	 * Since we use syslog, we discard the prefix set in tdb_init,
+	 * because syslog adds our own prefix too. The errpfx would be
+	 * useful if we weren't dumping to syslog here.
+	 */
+	syslog(LOG_WARNING, "%s", msg);
 }
 
 static int buckets_owner_idx(DB *secondary, const DBT *pkey, const DBT *pdata,
#1 lore raw
Quoted 7 lines · Pete Zaitcev

On Fedora 14, the following is seen in syslog:

Apr 17 19:58:52 niphredil tabled: tabled: connecting to site
  hitlain.zaitcev.lan:8083: No route to host
Apr 17 19:58:56 niphredil tabled: tabled: DB_ENV->rep_elect:WARNING:
  nvotes (1) is sub-majority with nsites (2)
Quoted 7 lines

Drop the extra prefix, it only wastes screen space.

---
  lib/tdb.c |    7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)

applied 9-12