Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-11 19:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/fix-broken-broker-convert-call'

Browse source 
* origin/topic/timw/fix-broken-broker-convert-call:
  Fix usage of broker::convert(double,timespan)
This commit is contained in:
Tim Wojtulewicz 2022-07-08 10:13:00 -07:00
commit c697c8e19f
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
5.1.0-dev.204 | 2022-07-08 10:13:00 -0700
* Fix usage of broker::convert(double,timespan) (Tim Wojtulewicz, Corelight)
5.1.0-dev.202 | 2022-07-08 09:55:35 -0700
* Avoid calling safe_realloc unnecessarily from ODesc::Grow() (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
5.1.0-dev.202
5.1.0-dev.204

6
src/broker/Manager.cc
View file

@ -2050,9 +2050,9 @@ void Manager::PrepareForwarding(const std::string& name)
void Manager::SetMetricsExportInterval(double value)
{
broker::timespan ts;
if ( broker::convert(value, ts) )
bstate->endpoint.metrics_exporter().set_interval(ts);
using dbl_seconds = std::chrono::duration<double>;
auto ts = std::chrono::duration_cast<broker::timespan>(dbl_seconds{value});
bstate->endpoint.metrics_exporter().set_interval(ts);
}
void Manager::SetMetricsExportTopic(std::string value)