nagios-db-devel

[Nagios-db-devel] patch to current CVS

[<bar...@gm...>]

Hi list,
here is a patch to the current CVS revision of nagios-db for postgres. This
patch does:
* correct a bug on startup concerning neb_register_callback command change
* add some logging messages to help debugging
* correct a small typo in handling options (see "offset bugs in option
parsing" http://sourceforge.net/mailarchive/message.php?msg_id=3D12557459)
* modified neb initialisation so that 'processStart' is called when Nagios
starts and not when we have a NEBCALLBACK_TIMED_EVENT_DATA . The problem wa=
s
that processStart() was called berfore the nagios configuration was loaded
and therefor processStart() did not have configuration data available.

good luck.
Seb.B

[Nagios-db-devel] Re: patch to current CVS

[<bar...@gm...>]

SW5kZXg6IGluc2VydGVyLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL3Zhci9saWIvbmFtLWN2cy9O
QU0tc3JjL25hZ2lvcy1zcmMvbmFnaW9zLWRiL25lYi9pbnNlcnRlci5jLHYKcmV0cmlldmluZyBy
ZXZpc2lvbiAxLjIKcmV0cmlldmluZyByZXZpc2lvbiAxLjQKZGlmZiAtdSAtcjEuMiAtcjEuNAot
LS0gaW5zZXJ0ZXIuYwkyNCBOb3YgMjAwNSAxMDo1Njo1MSAtMDAwMAkxLjIKKysrIGluc2VydGVy
LmMJMjQgTm92IDIwMDUgMTM6NTk6MDkgLTAwMDAJMS40CkBAIC01Miw2ICs1Miw5IEBACiBzdGF0
aWMgaW50IHByb2Nlc3NTdGF0dXMoaW50LCB2b2lkICopOwogc3RhdGljIGludCBwcm9jZXNzQ2hl
Y2soaW50LCB2b2lkICopOwogCisvKiBoYW5kbGUgKi8KK3ZvaWQgKmluc2VydGVyX21vZHVsZV9o
YW5kbGU9TlVMTDsKKwogY2hhciAqCiBwdWxsVmFsdWUoY2hhciogaW4pCiB7CkBAIC04OSw2ICs5
Miw5IEBACiAKIAlnX3RocmVhZF9pbml0KDApOwogCisJLyogc2F2ZSBvdXIgaGFuZGxlICovCisJ
aW5zZXJ0ZXJfbW9kdWxlX2hhbmRsZT1oYW5kbGU7CisKIAl3cml0ZV90b19hbGxfbG9ncygiaW5p
dGlhbGl6aW5nIG5hZ2lvcy1kYiBwb3N0Z3JlcyBpbnNlcnRlci4uLiIsTlNMT0dfSU5GT19NRVNT
QUdFKTsKIAogCS8qIFBhcnNlIG91ciBhcmcgc3RyaW5nLgpAQCAtOTksMTIgKzEwNSwxNCBAQAog
CQl3cml0ZV90b19hbGxfbG9ncygibmFnaW9zLWRiIHBvc3RncmVzIGluc2VydGVyIGZhaWxlZCB0
byBmaW5kIHBvc3RncmVzIGhvc3QgaW4gYXJndWVtZW50IHN0cmluZyIsTlNMT0dfSU5GT19NRVNT
QUdFKTsKIAkJcmV0dXJuIDA7CiAJfQorCXdyaXRlX3RvX2FsbF9sb2dzKCJpbml0aWFsaXppbmcg
bmFnaW9zLWRiIHBvc3RncmVzIGluc2VydGVyLi4uaG9zdCIsTlNMT0dfSU5GT19NRVNTQUdFKTsK
IAlpZighKGhvc3QgPSBwdWxsVmFsdWUodG9rKzUpKSkKIAl7CiAJCS8qIHdlbGwsIHRoaXMgaXNu
J3QgZ29pbmcgdG8gZmx5LiAqLwogCQl3cml0ZV90b19hbGxfbG9ncygibmFnaW9zLWRiIHBvc3Rn
cmVzIGluc2VydGVyIGZhaWxlZCB0byBmaW5kIHZhbGlkIHBvc3RncmVzIGhvc3QgaW4gYXJndWVt
ZW50IHN0cmluZyIsTlNMT0dfSU5GT19NRVNTQUdFKTsKIAkJcmV0dXJuIDA7CiAJfQorCXdyaXRl
X3RvX2FsbF9sb2dzKCJpbml0aWFsaXppbmcgbmFnaW9zLWRiIHBvc3RncmVzIGluc2VydGVyLi4u
aG9zdCBPSyIsTlNMT0dfSU5GT19NRVNTQUdFKTsKIAogCWlmKCEodG9rID0gc3Ryc3RyKGFyZ3Ms
ImRiPSIpKSkKIAl7CkBAIC0xMTMsNiArMTIxLDcgQEAKIAkJZnJlZShob3N0KTsKIAkJcmV0dXJu
IDA7CiAJfQorCXdyaXRlX3RvX2FsbF9sb2dzKCJpbml0aWFsaXppbmcgbmFnaW9zLWRiIHBvc3Rn
cmVzIGluc2VydGVyLi4uZGIiLE5TTE9HX0lORk9fTUVTU0FHRSk7CiAJaWYoIShkYiA9IHB1bGxW
YWx1ZSh0b2srMykpKQogCXsKIAkJLyogd2VsbCwgdGhpcyBpc24ndCBnb2luZyB0byBmbHkuICov
CkBAIC0xMjAsNiArMTI5LDcgQEAKIAkJZnJlZShob3N0KTsKIAkJcmV0dXJuIDA7CiAJfQorCXdy
aXRlX3RvX2FsbF9sb2dzKCJpbml0aWFsaXppbmcgbmFnaW9zLWRiIHBvc3RncmVzIGluc2VydGVy
Li4uZGIgb2siLE5TTE9HX0lORk9fTUVTU0FHRSk7CiAKIAlpZighKHRvayA9IHN0cnN0cihhcmdz
LCJ0aW1lb3V0PSIpKSkKIAl7CkBAIC0xMjksNiArMTM5LDcgQEAKIAkJZnJlZShkYik7CiAJCXJl
dHVybiAwOwogCX0KKwl3cml0ZV90b19hbGxfbG9ncygiaW5pdGlhbGl6aW5nIG5hZ2lvcy1kYiBw
b3N0Z3JlcyBpbnNlcnRlci4uLiB0aW1lb3V0IixOU0xPR19JTkZPX01FU1NBR0UpOwogCWlmKCEo
dmFsID0gcHVsbFZhbHVlKHRvays4KSkpCiAJewogCQkvKiB3ZWxsLCB0aGlzIGlzbid0IGdvaW5n
IHRvIGZseS4gKi8KQEAgLTEzNyw2ICsxNDgsNyBAQAogCQlmcmVlKGRiKTsKIAkJcmV0dXJuIDA7
CiAJfQorCXdyaXRlX3RvX2FsbF9sb2dzKCJpbml0aWFsaXppbmcgbmFnaW9zLWRiIHBvc3RncmVz
IGluc2VydGVyLi4udGltZW91dCBvayIsTlNMT0dfSU5GT19NRVNTQUdFKTsKIAl0aW1lb3V0ID0g
YXRvbCh2YWwpOwogCWZyZWUodmFsKTsKIAl2YWw9MDsKQEAgLTE0OSw3ICsxNjEsOCBAQAogCQlm
cmVlKGRiKTsKIAkJcmV0dXJuIDA7CiAJfQotCWlmKCEodmFsID0gcHVsbFZhbHVlKHRvays4KSkp
CisJd3JpdGVfdG9fYWxsX2xvZ3MoImluaXRpYWxpemluZyBuYWdpb3MtZGIgcG9zdGdyZXMgaW5z
ZXJ0ZXIuLi52YWNhdGlvbiIsTlNMT0dfSU5GT19NRVNTQUdFKTsKKwlpZighKHZhbCA9IHB1bGxW
YWx1ZSh0b2srOSkpKQogCXsKIAkJLyogd2VsbCwgdGhpcyBpc24ndCBnb2luZyB0byBmbHkuICov
CiAJCXdyaXRlX3RvX2FsbF9sb2dzKCJuYWdpb3MtZGIgcG9zdGdyZXMgaW5zZXJ0ZXIgZmFpbGVk
IHRvIGZpbmQgdmFsaWQgd3JhcHBlciB2YWNhdGlvbiB2YWx1ZSBpbiBhcmd1ZW1lbnQgc3RyaW5n
IixOU0xPR19JTkZPX01FU1NBR0UpOwpAQCAtMTU3LDYgKzE3MCw3IEBACiAJCWZyZWUoZGIpOwog
CQlyZXR1cm4gMDsKIAl9CisJd3JpdGVfdG9fYWxsX2xvZ3MoImluaXRpYWxpemluZyBuYWdpb3Mt
ZGIgcG9zdGdyZXMgaW5zZXJ0ZXIuLi52YWNhdGlvbiBvayIsTlNMT0dfSU5GT19NRVNTQUdFKTsK
IAl2YWNhdGlvbiA9IGF0b2wodmFsKTsKIAlmcmVlKHZhbCk7CiAJdmFsPTA7CkBAIC0xNjksNyAr
MTgzLDggQEAKIAkJZnJlZShkYik7CiAJCXJldHVybiAwOwogCX0KLQlpZighKHZhbCA9IHB1bGxW
YWx1ZSh0b2srOCkpKQorCXdyaXRlX3RvX2FsbF9sb2dzKCJpbml0aWFsaXppbmcgbmFnaW9zLWRi
IHBvc3RncmVzIGluc2VydGVyLi4ud3JpdGVzIixOU0xPR19JTkZPX01FU1NBR0UpOworCWlmKCEo
dmFsID0gcHVsbFZhbHVlKHRvays3KSkpCiAJewogCQkvKiB3ZWxsLCB0aGlzIGlzbid0IGdvaW5n
IHRvIGZseS4gKi8KIAkJd3JpdGVfdG9fYWxsX2xvZ3MoIm5hZ2lvcy1kYiBwb3N0Z3JlcyBpbnNl
cnRlciBmYWlsZWQgdG8gZmluZCB2YWxpZCB3cmFwcGVyIHdyaXRlIGxpbWl0IGluIGFyZ3VlbWVu
dCBzdHJpbmciLE5TTE9HX0lORk9fTUVTU0FHRSk7CkBAIC0xNzcsNiArMTkyLDcgQEAKIAkJZnJl
ZShkYik7CiAJCXJldHVybiAwOwogCX0KKwl3cml0ZV90b19hbGxfbG9ncygiaW5pdGlhbGl6aW5n
IG5hZ2lvcy1kYiBwb3N0Z3JlcyBpbnNlcnRlci4uLndyaXRlcyBvayIsTlNMT0dfSU5GT19NRVNT
QUdFKTsKIAl3cml0ZXMgPSBhdG9sKHZhbCk7CiAJZnJlZSh2YWwpOwogCXZhbD0wOwpAQCAtMjUw
LDcgKzI2Niw3IEBACiAKIAl3cml0ZV90b19hbGxfbG9ncygibmFnaW9zLWRiIHBvc3RncmVzIGlu
c2VydGVyIGxvY2tlZCBpbnRvIGRiIixOU0xPR19JTkZPX01FU1NBR0UpOwogCi0JbmViX3JlZ2lz
dGVyX2NhbGxiYWNrKE5FQkNBTExCQUNLX1RJTUVEX0VWRU5UX0RBVEEsIDAsIHByb2Nlc3NTdGFy
dCk7CisJbmViX3JlZ2lzdGVyX2NhbGxiYWNrKE5FQkNBTExCQUNLX1BST0NFU1NfREFUQSwgaW5z
ZXJ0ZXJfbW9kdWxlX2hhbmRsZSwgMCwgcHJvY2Vzc1N0YXJ0KTsKIAogCXJldHVybiAwOwogfQpA
QCAtMzA5LDEwICszMjUsMTAgQEAKIAlnaW50OAkJc3RhdHVzID0gMDsKIAogCS8qIHZlcmlmeSB0
aGF0IHdlJ3JlIGRlYWxpbmcgd2l0aCB0aGUgcmlnaHQga2luZCBvZiBtZXNzYWdlLiAqLwotCWlm
KGNtZCAhPSBORUJDQUxMQkFDS19USU1FRF9FVkVOVF9EQVRBKSByZXR1cm4gMDsKKwlpZihjbWQg
IT0gTkVCQ0FMTEJBQ0tfUFJPQ0VTU19EQVRBKSByZXR1cm4gMDsKIAogCS8qIHZlcmlmeSB0aGF0
IG91ciBjb25maWcgZGF0YSBoYXMgYmVlbiBpbml0aWFsaXplZC4gKi8KLQlpZigoKG5lYnN0cnVj
dF90aW1lZF9ldmVudF9kYXRhKilkYXRhKS0+dHlwZSAhPSBORUJUWVBFX1RJTUVERVZFTlRfQURE
KSByZXR1cm4gMDsKKwlpZigoKG5lYnN0cnVjdF9wcm9jZXNzX2RhdGEqKWRhdGEpLT50eXBlICE9
IE5FQlRZUEVfUFJPQ0VTU19TVEFSVCkgcmV0dXJuIDA7CiAKIAkvKiBDbGVhciBvdXQgdGhlIHBy
ZXZpb3VzIGNvbmZpZyBpbmZvLi4uLiAqLwogCXN0YXR1cyA9IFBHcXVlcnkoInNlbGVjdCBlbXB0
eV9jb25maWcoKSIsJnJlcywzKTsKQEAgLTMyNiw2ICszNDIsNyBAQAogCS8qIC4uLi4gYW5kIGlu
c2VydCBuZXcgY29uZmlnIGluZm8uIFN0YXJ0IHdpdGggdGhlIGhvc3RzLiAqLwogCWZvcihncm91
cGNvdW50PTAsIGhsID0gaG9zdF9saXN0OyBobDsgaGwgPSBobC0+bmV4dCkKIAl7CisJCQogCQkv
KiB1cGRhdGUgdGhpcyBob3N0ICovCiAJCWNoYXIgKmhvc3ROYW1lID0gcXVlcmlmeShobC0+bmFt
ZSk7CiAKQEAgLTU3OCwxMiArNTk1LDE0IEBACiAKIAl3cml0ZV90b19hbGxfbG9ncygibmFnaW9z
LWRiOiBjb25maWd1cmF0aW9uIGNvbXBsZXRlLiBSZWdpc3RlcmluZyBmb3Igc3RhdHVzIG5vdGlm
aWNhdGlvbnMuLi4iLE5TTE9HX0lORk9fTUVTU0FHRSk7CiAKLQluZWJfZGVyZWdpc3Rlcl9jYWxs
YmFjayhORUJDQUxMQkFDS19USU1FRF9FVkVOVF9EQVRBLCBwcm9jZXNzU3RhcnQpOwotCW5lYl9y
ZWdpc3Rlcl9jYWxsYmFjayhORUJDQUxMQkFDS19IT1NUX1NUQVRVU19EQVRBLCAwLCBwcm9jZXNz
U3RhdHVzKTsKLQluZWJfcmVnaXN0ZXJfY2FsbGJhY2soTkVCQ0FMTEJBQ0tfU0VSVklDRV9TVEFU
VVNfREFUQSwgMCwgcHJvY2Vzc1N0YXR1cyk7Ci0JbmViX3JlZ2lzdGVyX2NhbGxiYWNrKE5FQkNB
TExCQUNLX0hPU1RfQ0hFQ0tfREFUQSwgMCwgcHJvY2Vzc0NoZWNrKTsKLQluZWJfcmVnaXN0ZXJf
Y2FsbGJhY2soTkVCQ0FMTEJBQ0tfU0VSVklDRV9DSEVDS19EQVRBLCAwLCBwcm9jZXNzQ2hlY2sp
OworCW5lYl9kZXJlZ2lzdGVyX2NhbGxiYWNrKE5FQkNBTExCQUNLX1BST0NFU1NfREFUQSwgcHJv
Y2Vzc1N0YXJ0KTsKKwluZWJfcmVnaXN0ZXJfY2FsbGJhY2soTkVCQ0FMTEJBQ0tfSE9TVF9TVEFU
VVNfREFUQSwgaW5zZXJ0ZXJfbW9kdWxlX2hhbmRsZSwgMCwgcHJvY2Vzc1N0YXR1cyk7CisJbmVi
X3JlZ2lzdGVyX2NhbGxiYWNrKE5FQkNBTExCQUNLX1NFUlZJQ0VfU1RBVFVTX0RBVEEsIGluc2Vy
dGVyX21vZHVsZV9oYW5kbGUsIDAsIHByb2Nlc3NTdGF0dXMpOworCW5lYl9yZWdpc3Rlcl9jYWxs
YmFjayhORUJDQUxMQkFDS19IT1NUX0NIRUNLX0RBVEEsIGluc2VydGVyX21vZHVsZV9oYW5kbGUs
IDAsIHByb2Nlc3NDaGVjayk7CisJbmViX3JlZ2lzdGVyX2NhbGxiYWNrKE5FQkNBTExCQUNLX1NF
UlZJQ0VfQ0hFQ0tfREFUQSwgaW5zZXJ0ZXJfbW9kdWxlX2hhbmRsZSwgMCwgcHJvY2Vzc0NoZWNr
KTsKIAorCXdyaXRlX3RvX2FsbF9sb2dzKCJuYWdpb3MtZGI6IEZpbmlzaGVkIHByb2Nlc3NTdGFy
dCgpIixOU0xPR19JTkZPX01FU1NBR0UpOworCQogCXJldHVybiAwOwogfQogCkBAIC02NzksNiAr
Njk4LDkgQEAKIAkJCWNoYXIgKnNhZmVIb3N0Q2hlY2tDb21tYW5kID0gcXVlcmlmeSh0bXBfaG9z
dC0+aG9zdF9jaGVja19jb21tYW5kKTsKIAkJCWNoYXIgKnNhZmVQZXJmRGF0YSA9IHF1ZXJpZnko
dG1wX2hvc3QtPnBlcmZfZGF0YSk7CiAKKwkJCXNucHJpbnRmKHRlbXBfYnVmZmVyLHNpemVvZih0
ZW1wX2J1ZmZlciksIm5hZ2lvcy1kYjogdXBkYXRpbmcgJyVzJyIsIHNhZmVOYW1lKTsKKwkJCXdy
aXRlX3RvX2FsbF9sb2dzKHRlbXBfYnVmZmVyLE5TTE9HX0lORk9fTUVTU0FHRSk7CisKIAogCQkJ
c25wcmludGYodGVtcF9idWZmZXIsIHNpemVvZih0ZW1wX2J1ZmZlciksICJzZWxlY3QgdXBkYXRl
X2hvc3QoJXMsJXMsJXMsJXMsJXMsJXMsJXMsJXMsJXMsJXMsJWx1LCVzLCVzLCVzLCVkLCVkLCVz
LCVkLCVzLCVmLCVmLCVsdSwlbHUsJWQsJWx1LCVsdSwlcywlcywlZCkiLAogCQkJCQkJCQkJCQkJ
CQlOVUxMX1NUUklORyhzYWZlTmFtZSksCg==

Re: [Nagios-db-devel] Re: patch to current CVS

[Ben <be...@si...>]

Thanks S=E9bastien, I'm applying these to CVS right now. Well, except =20=

for the change to use NEBCALLBACK_PROCESS_DATA instead of =20
NEBCALLBACK_TIMED_EVENT_DATA. In the past, I purposely stopped using =20
PROCESS_DATA. I haven't time recently to work on Nagios or pay much =20
attention to checkins, but have things changed to make the =20
TIMED_EVENT_DATA callback point unacceptable? If so, how?

On Nov 24, 2005, at 6:36 AM, S=E9bastien Barbereau wrote:

> Hi list,
> here is a patch to the current CVS revision of nagios-db for =20
> postgres. This patch does:
> * correct a bug on startup concerning neb_register_callback command =20=

> change
> * add some logging messages to help debugging
> * correct a small typo in handling options (see "offset bugs in =20
> option parsing" http://sourceforge.net/mailarchive/message.php?=20
> msg_id=3D12557459 )
> * modified neb initialisation so that 'processStart' is called when =20=

> Nagios starts and not when we have a NEBCALLBACK_TIMED_EVENT_DATA . =20=

> The problem was that processStart() was called berfore the nagios =20
> configuration was loaded and therefor processStart() did not have =20
> configuration data available.
>
> good luck.
> Seb.B
>
> forgot the file :)
>
> <inserter.c.patch>