diff options
| author | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2022-11-09 12:47:48 +0300 |
|---|---|---|
| committer | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2022-11-09 12:48:50 +0300 |
| commit | 17ff81f9b4d32f8b667faedf4077119e70859e62 (patch) | |
| tree | 1b3deb52e4c7a3cb0b774807160d7dcd0430f01f | |
| parent | cc875b3736ce564d99e43b8618155f669fd6c8a2 (diff) | |
.......PS. [ZBX-21786] fixed 'invalid timeout' error occurring after script item parameters removal
* commit '0362810fddc3a412fc08a3cf9c2bb3e3d1db178f':
.......PS. [ZBX-21786] fixed 'invalid timeout' error occurring after script item parameters removal
(cherry picked from commit a4afd0a56adc59628728b210b8faeb1258ed888a)
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-21786 | 1 | ||||
| -rw-r--r-- | src/libs/zbxdbcache/dbconfig.c | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21786 b/ChangeLog.d/bugfix/ZBX-21786 new file mode 100644 index 00000000000..b49e12c1d14 --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-21786 @@ -0,0 +1 @@ +.......PS. [ZBX-21786] fixed 'invalid timeout' error occurring after script item parameters removal (asestakovs) diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c index f114f847907..ea4b1b9ff86 100644 --- a/src/libs/zbxdbcache/dbconfig.c +++ b/src/libs/zbxdbcache/dbconfig.c @@ -5037,12 +5037,7 @@ static void DCsync_itemscript_param(zbx_dbsync_t *sync) { scriptitem = (ZBX_DC_SCRIPTITEM *)items.values[i]; - if (0 == scriptitem->params.values_num) - { - zbx_vector_ptr_destroy(&scriptitem->params); - zbx_hashset_remove_direct(&config->scriptitems, scriptitem); - } - else + if (0 < scriptitem->params.values_num) zbx_vector_ptr_sort(&scriptitem->params, dc_compare_itemscript_param); } |