"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/zabbix_server/server.c" between
zabbix-5.4.2.tar.gz and zabbix-5.4.3.tar.gz

About: ZABBIX is an enterprise-class distributed monitoring solution for servers and applications.

server.c  (zabbix-5.4.2):server.c  (zabbix-5.4.3)
skipping to change at line 351 skipping to change at line 351
{ {
/* fail if the main process is queried */ /* fail if the main process is queried */
return FAIL; return FAIL;
} }
else if (local_server_num <= (server_count += CONFIG_CONFSYNCER_FORKS)) else if (local_server_num <= (server_count += CONFIG_CONFSYNCER_FORKS))
{ {
/* make initial configuration sync before worker processes are fo rked */ /* make initial configuration sync before worker processes are fo rked */
*local_process_type = ZBX_PROCESS_TYPE_CONFSYNCER; *local_process_type = ZBX_PROCESS_TYPE_CONFSYNCER;
*local_process_num = local_server_num - server_count + CONFIG_CON FSYNCER_FORKS; *local_process_num = local_server_num - server_count + CONFIG_CON FSYNCER_FORKS;
} }
else if (local_server_num <= (server_count += CONFIG_ALERTMANAGER_FORKS))
{
/* data collection processes might utilize CPU fully, start manag
er and worker processes beforehand */
*local_process_type = ZBX_PROCESS_TYPE_ALERTMANAGER;
*local_process_num = local_server_num - server_count + CONFIG_ALE
RTMANAGER_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_ALERTER_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_ALERTER;
*local_process_num = local_server_num - server_count + CONFIG_ALE
RTER_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_PREPROCMAN_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_PREPROCMAN;
*local_process_num = local_server_num - server_count + CONFIG_PRE
PROCMAN_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_PREPROCESSOR_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_PREPROCESSOR;
*local_process_num = local_server_num - server_count + CONFIG_PRE
PROCESSOR_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_LLDMANAGER_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_LLDMANAGER;
*local_process_num = local_server_num - server_count + CONFIG_LLD
MANAGER_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_LLDWORKER_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_LLDWORKER;
*local_process_num = local_server_num - server_count + CONFIG_LLD
WORKER_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_IPMIMANAGER_FORKS)) else if (local_server_num <= (server_count += CONFIG_IPMIMANAGER_FORKS))
{ {
*local_process_type = ZBX_PROCESS_TYPE_IPMIMANAGER; *local_process_type = ZBX_PROCESS_TYPE_IPMIMANAGER;
*local_process_num = local_server_num - server_count + CONFIG_TAS KMANAGER_FORKS; *local_process_num = local_server_num - server_count + CONFIG_TAS KMANAGER_FORKS;
} }
else if (local_server_num <= (server_count += CONFIG_HOUSEKEEPER_FORKS)) else if (local_server_num <= (server_count += CONFIG_HOUSEKEEPER_FORKS))
{ {
*local_process_type = ZBX_PROCESS_TYPE_HOUSEKEEPER; *local_process_type = ZBX_PROCESS_TYPE_HOUSEKEEPER;
*local_process_num = local_server_num - server_count + CONFIG_HOU SEKEEPER_FORKS; *local_process_num = local_server_num - server_count + CONFIG_HOU SEKEEPER_FORKS;
} }
skipping to change at line 441 skipping to change at line 472
else if (local_server_num <= (server_count += CONFIG_TRAPPER_FORKS)) else if (local_server_num <= (server_count += CONFIG_TRAPPER_FORKS))
{ {
*local_process_type = ZBX_PROCESS_TYPE_TRAPPER; *local_process_type = ZBX_PROCESS_TYPE_TRAPPER;
*local_process_num = local_server_num - server_count + CONFIG_TRA PPER_FORKS; *local_process_num = local_server_num - server_count + CONFIG_TRA PPER_FORKS;
} }
else if (local_server_num <= (server_count += CONFIG_PINGER_FORKS)) else if (local_server_num <= (server_count += CONFIG_PINGER_FORKS))
{ {
*local_process_type = ZBX_PROCESS_TYPE_PINGER; *local_process_type = ZBX_PROCESS_TYPE_PINGER;
*local_process_num = local_server_num - server_count + CONFIG_PIN GER_FORKS; *local_process_num = local_server_num - server_count + CONFIG_PIN GER_FORKS;
} }
else if (local_server_num <= (server_count += CONFIG_ALERTMANAGER_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_ALERTMANAGER;
*local_process_num = local_server_num - server_count + CONFIG_ALE
RTMANAGER_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_ALERTER_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_ALERTER;
*local_process_num = local_server_num - server_count + CONFIG_ALE
RTER_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_PREPROCMAN_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_PREPROCMAN;
*local_process_num = local_server_num - server_count + CONFIG_PRE
PROCMAN_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_PREPROCESSOR_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_PREPROCESSOR;
*local_process_num = local_server_num - server_count + CONFIG_PRE
PROCESSOR_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_LLDMANAGER_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_LLDMANAGER;
*local_process_num = local_server_num - server_count + CONFIG_LLD
MANAGER_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_LLDWORKER_FORKS))
{
*local_process_type = ZBX_PROCESS_TYPE_LLDWORKER;
*local_process_num = local_server_num - server_count + CONFIG_LLD
WORKER_FORKS;
}
else if (local_server_num <= (server_count += CONFIG_ALERTDB_FORKS)) else if (local_server_num <= (server_count += CONFIG_ALERTDB_FORKS))
{ {
*local_process_type = ZBX_PROCESS_TYPE_ALERTSYNCER; *local_process_type = ZBX_PROCESS_TYPE_ALERTSYNCER;
*local_process_num = local_server_num - server_count + CONFIG_ALE RTDB_FORKS; *local_process_num = local_server_num - server_count + CONFIG_ALE RTDB_FORKS;
} }
else if (local_server_num <= (server_count += CONFIG_HISTORYPOLLER_FORKS) ) else if (local_server_num <= (server_count += CONFIG_HISTORYPOLLER_FORKS) )
{ {
*local_process_type = ZBX_PROCESS_TYPE_HISTORYPOLLER; *local_process_type = ZBX_PROCESS_TYPE_HISTORYPOLLER;
*local_process_num = local_server_num - server_count + CONFIG_HIS TORYPOLLER_FORKS; *local_process_num = local_server_num - server_count + CONFIG_HIS TORYPOLLER_FORKS;
} }
 End of changes. 2 change blocks. 
36 lines changed or deleted 38 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)