From d3979fb56d3386bd0ed82523e936ebf44c20c7ac Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 5 May 2021 22:26:16 -0700
Subject: [PATCH] test log config from environment

---
 src/log.cpp      |  1 -
 test/testlog.cpp | 29 +++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/log.cpp b/src/log.cpp
index b43e8bd..27551ac 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -171,7 +171,6 @@ struct logger_gbl_t {
             for(auto& tup : config) {
                 if(epicsStrGlobMatch(name.c_str(), tup.first.c_str())) {
                     lvl = tup.second;
-                    break;
                 }
             }
         }
diff --git a/test/testlog.cpp b/test/testlog.cpp
index eaaecfa..f05d265 100644
--- a/test/testlog.cpp
+++ b/test/testlog.cpp
@@ -7,8 +7,8 @@
 #include <ostream>
 
 #include <testMain.h>
-
 #include <epicsUnitTest.h>
+#include <envDefs.h>
 
 #include <pvxs/unittest.h>
 #include <pvxs/log.h>
@@ -25,6 +25,8 @@ std::ostream& operator<<(std::ostream& strm, Level lvl)
     CASE(Info);
     CASE(Debug);
 #undef CASE
+    default:
+        strm<<"Level("<<int(lvl)<<")";
     }
     return strm;
 }
@@ -74,12 +76,35 @@ void testLog()
     testEq(loggerb.lvl.load(), Level::Err);
 }
 
+DEFINE_LOGGER(enva, "env.a");
+DEFINE_LOGGER(envb, "env.b");
+DEFINE_LOGGER(envc, "env.other.c");
+
+void testEnv()
+{
+    testDiag("%s", __func__);
+
+    logger_level_clear();
+
+    epicsEnvSet("PVXS_LOG", "foo,env.*=INFO,env.other.c=DEBUG,bar=FAKELEVEL");
+    logger_config_env();
+
+    (void)enva.test(Level::Info);
+    (void)envb.test(Level::Info);
+    (void)envc.test(Level::Info);
+
+    testEq(enva.lvl.load(), Level::Info);
+    testEq(envb.lvl.load(), Level::Info);
+    testEq(envc.lvl.load(), Level::Debug);
+}
+
 } // namespace
 
 MAIN(testlog)
 {
-    testPlan(13);
+    testPlan(16);
     testSetup();
     testLog();
+    testEnv();
     return testDone();
 }