config: move THROW_CONFIG_ERROR to bees-config.h

This provides external config readers (e.g. BeesFilter) a standard
method to report configuration parse errors.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>

diff --git a/src/bees-config.cc b/src/bees-config.cc
index 08ed39c205c0a408c5f681a414461ad6f041134e..fd8328c264aeb837fe2e634180229b702ce38660 100644 (file)
--- a/src/bees-config.cc
+++ b/src/bees-config.cc
@@ -13,13 +13,8 @@
 #include <sstream>
 #include <sys/statfs.h>
 
-#define THROW_CONFIG_ERROR(__key, __value, __message) do { \
-       ostringstream __oss; \
-       __oss << "configuration error: " << __key << " = \"" << __value << "\": " << __message; \
-       throw invalid_argument(__oss.str()); \
-} while (false)
+unique_ptr<BeesConfig::DefaultMap> BeesConfig::s_defaults;
 
-unique_ptr<map<string, Innie>> BeesConfig::s_defaults;
 
 BeesConfig::Register::Register::Register(const char *const version, const char *const text)
 {

diff --git a/src/bees-config.h b/src/bees-config.h
index d6a388c03082a91182b011e14d4f52a898f678c4..8b4aa7bc3edcbd87da199fe736ae98cbc80c72c0 100644 (file)
--- a/src/bees-config.h
+++ b/src/bees-config.h
@@ -178,3 +178,13 @@ double bees_parse_duration(const string& str);
 double bees_parse_ratio(const string& str);
 
 /// @}
+
+/**
+ * Throw a @c std::invalid_argument exception formatted as a configuration error.
+ * Includes the key and the offending value in the message.
+ */
+#define THROW_CONFIG_ERROR(__key, __value, __message) do { \
+       std::ostringstream __oss; \
+       __oss << "configuration error: " << (__key) << " = \"" << (__value) << "\": " << (__message); \
+       throw std::invalid_argument(__oss.str()); \
+} while (false)