diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-04-04 11:38:04 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-04-04 11:38:04 +0300 |
| commit | 516465ca4ec5c9b1c9be9c28281082a61344d690 (patch) | |
| tree | d404eb3c907e241cb9b3ae12fa6bdcfe36ba79dd /src | |
| parent | 91d6033c9bbfd3c50ecb9febae242a03fcf18aaa (diff) | |
.......... [DEV-2133] refactored libzbxavailability
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxavailability/avail_protocol.c | 2 | ||||
| -rw-r--r-- | src/libs/zbxavailability/availability.c | 4 | ||||
| -rw-r--r-- | src/zabbix_server/availability/avail_manager.c | 2 | ||||
| -rw-r--r-- | src/zabbix_server/poller/poller.c | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/libs/zbxavailability/avail_protocol.c b/src/libs/zbxavailability/avail_protocol.c index b82cd3496b2..72d629b32e8 100644 --- a/src/libs/zbxavailability/avail_protocol.c +++ b/src/libs/zbxavailability/avail_protocol.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "avail_protocol.h" +#include "zbxavailability.h" #include "zbxserialize.h" diff --git a/src/libs/zbxavailability/availability.c b/src/libs/zbxavailability/availability.c index f5246ed9886..0daf89afb50 100644 --- a/src/libs/zbxavailability/availability.c +++ b/src/libs/zbxavailability/availability.c @@ -20,7 +20,6 @@ #include "zbxavailability.h" #include "log.h" #include "zbxipcservice.h" -#include "avail_protocol.h" void zbx_availability_flush(unsigned char *data, zbx_uint32_t size) { @@ -37,12 +36,13 @@ void zbx_availability_flush(unsigned char *data, zbx_uint32_t size) exit(EXIT_FAILURE); } } - +#define ZBX_IPC_AVAILABILITY_REQUEST 1 if (FAIL == zbx_ipc_socket_write(&socket, ZBX_IPC_AVAILABILITY_REQUEST, data, size)) { zabbix_log(LOG_LEVEL_CRIT, "cannot send data to availability manager service"); exit(EXIT_FAILURE); } +#undef ZBX_IPC_AVAILABILITY_REQUEST } void zbx_availabilities_flush(const zbx_vector_availability_ptr_t *interface_availabilities) diff --git a/src/zabbix_server/availability/avail_manager.c b/src/zabbix_server/availability/avail_manager.c index 091b78f7a2b..2394e334cb7 100644 --- a/src/zabbix_server/availability/avail_manager.c +++ b/src/zabbix_server/availability/avail_manager.c @@ -26,8 +26,6 @@ #include "daemon.h" #include "sighandler.h" #include "dbcache.h" -#include "avail_protocol.h" - extern ZBX_THREAD_LOCAL unsigned char process_type; extern unsigned char program_type; diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c index ee9048b22e5..dc9233a278a 100644 --- a/src/zabbix_server/poller/poller.c +++ b/src/zabbix_server/poller/poller.c @@ -40,7 +40,6 @@ #include "zbxcrypto.h" #include "zbxjson.h" #include "zbxhttp.h" -#include "avail_protocol.h" #include "log.h" #include "zbxavailability.h" |