Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get #72

Closed
wants to merge 3 commits into from
Closed

Get #72

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
712a154
enh(custom_variable host&service) : constructor with parameters + ut …
jbrouze Aug 20, 2020
9b03711
enh(custom_variable) : updated ut
jbrouze Aug 24, 2020
2f0fd2e
enh(get_id) : replaced get_host_id(arg)/get_service_id(arg) by get_ho…
jbrouze Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
enh(get_id) : replaced get_host_id(arg)/get_service_id(arg) by get_ho… 
…st_id()/get_service_id()
  • Loading branch information
@jbrouze
jbrouze committed Aug 24, 2020
commit 2f0fd2e4e4862a39d0e82d7baadd7edc8b0421d3
25 changes: 12 additions & 13 deletions src/cbmod/callbacks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ int neb::callback_custom_variable(int callback_type, void* data) {
engine::host* hst(static_cast<engine::host*>(cvar->object_ptr));
if (hst && !hst->get_name().empty()) {
// Fill custom variable event.
uint64_t host_id = engine::get_host_id(hst->get_name());
uint64_t host_id = hst->get_host_id();
if (host_id != 0) {
std::shared_ptr<custom_variable> new_cvar = std::make_shared<custom_variable>(
cvar->var_name,
Expand All @@ -285,7 +285,7 @@ int neb::callback_custom_variable(int callback_type, void* data) {
case NEBTYPE_HOSTCUSTOMVARIABLE_DELETE: {
engine::host* hst(static_cast<engine::host*>(cvar->object_ptr));
if (hst && !hst->get_name().empty()) {
uint32_t host_id = engine::get_host_id(hst->get_name());
uint32_t host_id = hst->get_host_id();
if (host_id != 0) {
std::shared_ptr<custom_variable> old_cvar = std::make_shared<custom_variable>(
cvar->var_name,
Expand All @@ -312,15 +312,14 @@ int neb::callback_custom_variable(int callback_type, void* data) {
if (svc && !svc->get_description().empty() &&
!svc->get_hostname().empty()) {
// Fill custom variable event.
std::pair<uint32_t, uint32_t> p;
p = engine::get_host_and_service_id(svc->get_hostname(),
svc->get_description());
if (p.first && p.second) {
uint32_t host_id = svc->get_host_id();
uint32_t service_id = svc->get_service_id();
if (host_id && service_id) {
std::shared_ptr<custom_variable> new_cvar = std::make_shared<custom_variable>(
cvar->var_name,
cvar->var_value, // var_value
p.first, // host_id
p.second, // service_id
host_id,
service_id,
false, // modified
cvar->timestamp.tv_sec, // update_time
true, // enabled
Expand All @@ -340,14 +339,14 @@ int neb::callback_custom_variable(int callback_type, void* data) {
engine::service* svc{static_cast<engine::service*>(cvar->object_ptr)};
if (svc && !svc->get_description().empty() &&
!svc->get_hostname().empty()) {
std::pair<uint64_t, uint64_t> p{engine::get_host_and_service_id(
svc->get_hostname(), svc->get_description())};
if (p.first && p.second) {
uint32_t host_id = svc->get_host_id();
uint32_t service_id = svc->get_service_id();
if (host_id && service_id) {
std::shared_ptr<custom_variable> old_cvar = std::make_shared<custom_variable>(
cvar->var_name,
cvar->var_value, // var_value
p.first, // host_id
p.second, // service_id
host_id,
service_id,
true, // modified
cvar->timestamp.tv_sec, // update_time
false, // enabled
Expand Down