From ab6f0b9641ad6e9cef72f73d23e31138a97a225b Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Sun, 3 May 2020 08:01:25 -0600
Subject: convert some printError calls to logError

---
 src/libutil/affinity.cc |  4 ++--
 src/libutil/error.hh    |  6 ++++++
 src/libutil/logging.hh  |  1 +
 src/libutil/util.cc     | 18 +++++++++---------
 4 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'src/libutil')

diff --git a/src/libutil/affinity.cc b/src/libutil/affinity.cc
index 98f8287ad..e3cf33b58 100644
--- a/src/libutil/affinity.cc
+++ b/src/libutil/affinity.cc
@@ -25,7 +25,7 @@ void setAffinityTo(int cpu)
     CPU_ZERO(&newAffinity);
     CPU_SET(cpu, &newAffinity);
     if (sched_setaffinity(0, sizeof(cpu_set_t), &newAffinity) == -1)
-        printError(format("failed to lock thread to CPU %1%") % cpu);
+        printError("failed to lock thread to CPU %1%", cpu);
 #endif
 }
 
@@ -47,7 +47,7 @@ void restoreAffinity()
 #if __linux__
     if (!didSaveAffinity) return;
     if (sched_setaffinity(0, sizeof(cpu_set_t), &savedAffinity) == -1)
-        printError("failed to restore affinity %1%");
+        _printError("failed to restore affinity");
 #endif
 }
 
diff --git a/src/libutil/error.hh b/src/libutil/error.hh
index 48e6311bd..86cff5609 100644
--- a/src/libutil/error.hh
+++ b/src/libutil/error.hh
@@ -117,6 +117,12 @@ public:
               }
     { }
 
+    BaseError(hintformat hint)
+        : err { .level = lvlError,
+                .hint = hint
+              }
+    { }
+
     BaseError(ErrorInfo e)
         : err(e)
     { }
diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh
index 0c4980b83..5f03cdf41 100644
--- a/src/libutil/logging.hh
+++ b/src/libutil/logging.hh
@@ -149,6 +149,7 @@ extern Verbosity verbosity; /* suppress msgs > this */
         } \
     } while (0)
 
+#define _printError(args...) printMsg(lvlError, args)
 #define printError(args...) printMsg(lvlError, args)
 #define printInfo(args...) printMsg(lvlInfo, args)
 #define printTalkative(args...) printMsg(lvlTalkative, args)
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 747a9e991..68dc1b738 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -1417,15 +1417,15 @@ string base64Decode(const string & s)
 }
 
 
-void callFailure(const std::function<void(std::exception_ptr exc)> & failure, std::exception_ptr exc)
-{
-    try {
-        failure(exc);
-    } catch (std::exception & e) {
-        printError("uncaught exception: %s", e.what());
-        abort();
-    }
-}
+// void callFailure(const std::function<void(std::exception_ptr exc)> & failure, std::exception_ptr exc)
+// {
+//     try {
+//         failure(exc);
+//     } catch (std::exception & e) {
+//         printError("uncaught exception: %s", e.what());
+//         abort();
+//     }
+// }
 
 
 static Sync<std::pair<unsigned short, unsigned short>> windowSize{{0, 0}};
-- 
cgit v1.2.3