]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #3920: (master forward-port): perf_mon: continue even when pegcounts...
authorMichael Matirko (mmatirko) <mmatirko@cisco.com>
Wed, 19 Jul 2023 15:15:04 +0000 (15:15 +0000)
committerSteven Baigal (sbaigal) <sbaigal@cisco.com>
Wed, 19 Jul 2023 15:15:04 +0000 (15:15 +0000)
Merge in SNORT/snort3 from ~MMATIRKO/snort3:peg_warn_master to master

Squashed commit of the following:

commit b0ae8a092363cd6f1b21eb2df5e6406955700b2a
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Fri May 26 19:28:55 2023 +0000

    perf_mon: continue even when pegcounts can't be resolved

    Merge in FIREPOWER/snort3 from ~MMATIRKO/snort3:peg_warning to release/7.0.6

    * commit 'adc617b60633098a34abdce6fa7c56b0e9019aa4':
      build: fix issues with local build
      perf_mon: continue even when pegcounts can't be resolved

src/network_inspectors/perf_monitor/perf_module.cc

index 6aaf030fdf0a00fd80fb085a20e545f59d79f59e..240328d0f76b9cc5bcb5fa40eb220e2e67dac56a 100644 (file)
@@ -409,8 +409,8 @@ bool ModuleConfig::resolve()
         {
             if ( !i.second )
             {
-                ParseError("Perf monitor is unable to find %s.%s count", name.c_str(), i.first.c_str());
-                return false;
+                ParseWarning(WARN_CONF, "Perf monitor is unable to find %s.%s count\n",
+                    name.c_str(), i.first.c_str());
             }
         }
     }