Bug#404018: Close the file descriptor when binding to a socket fails.
This closes the second part of the bug reported by Max Kellermann.
This closes the second part of the bug reported by Max Kellermann.
Bug#404018: Break out of the `while (loop)'-loop when no socket can be opened.
This fixes the first part of the bug reported by Max Kellermann.
This fixes the first part of the bug reported by Max Kellermann.
Bumped version to 3.10.3; Updated ChangeLog.
ntpd plugin: Use the `NI_MAXHOST' define for the fixed-size buffer `peername'.
ntpd plugin: Fix buffer reallocation when the message is send in more than one packet.
debian/: Removed one last unneccessary file.
debian/: Imported the files from Sebastian's Debian package, part 2.
debian/: Imported the files from Sebastian's Debian package.
configure.in, utils_mount.c: Improved the detection of the different `getmntent' variants.
The check provided by `autoconf' has been completely removed, since it doesn't
provide the information we need and it's internals seem to change more often
than is practical.
The check provided by `autoconf' has been completely removed, since it doesn't
provide the information we need and it's internals seem to change more often
than is practical.
Bumped version to 3.10.2; Updated ChangeLog.
mysql plugin: Don't give up when connecting to the database fails during `init'.
Instead a connection attempt is made in increasing intervals, up to one day.
Instead a connection attempt is made in increasing intervals, up to one day.
ntpd plugin: Pass a `struct sockaddr' to `getnameinfo', rather than a `struct in_addr'.
Thanks to Lubos Stanek for pointing me in the right direction :)
Thanks to Lubos Stanek for pointing me in the right direction :)
Merge branches 'ff/ping', 'ff/macosx-swap' and 'ff/netbsd' into collectd-3.10
src/utils_mount.c: Correct syntax errors in error-strings.
swap plugin: Removed unused variable `status' which aborted the build with gcc.
src/utils_mount.c: Prefer `getvfsstat' over `getfsstat' if both are present.
Apparently the `getfsstat' syscall is deprecated, so don't use it unless there
is no alternative.
Apparently the `getfsstat' syscall is deprecated, so don't use it unless there
is no alternative.
src/urils_mount.c: Use `getvfsstat' on NetBSD, if available.
ping plugin: Add the hosts during initialization, not when reading the config file.
Since adding a host to liboping might block when no nameserver can be reached
or another problem occures (normally this means network misconfiguration) it's
not the best idea to do this when reading the config file. At that point we
didn't fork to the background yet, so the boot process may hang which is not good.
Also, hosts that cannot be added right away are tried again in increasing intervals.
Since adding a host to liboping might block when no nameserver can be reached
or another problem occures (normally this means network misconfiguration) it's
not the best idea to do this when reading the config file. At that point we
didn't fork to the background yet, so the boot process may hang which is not good.
Also, hosts that cannot be added right away are tried again in increasing intervals.
collectd.pod: Correct the information about the different modes.
There are _four_ modes now. Also, be more clear about when and why the `Client'
mode is the default mode.
There are _four_ modes now. Also, be more clear about when and why the `Client'
mode is the default mode.
18 years agoMerge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd...
Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd-3.10
collectd.conf.pod: Fix the synopsis: There is not `Port' option.
[22:23] <@tokkee> octo: Also laut deiner Manpage ist Listen ein Alias fuer Server und es gibt auch ne Option "Port" ;-)
[22:23] <@tokkee> octo: Also laut deiner Manpage ist Listen ein Alias fuer Server und es gibt auch ne Option "Port" ;-)
collectd.conf.in: Added (commented) lines for the `Listen' and `Server' options.
[22:20] <@tokkee> octo: Koenntest du bitte im naechsten Release von collectd in das Config-File auskommentierte Bsp-Zeilen fuer "Server" und "Port" mit rein nehmen?
[22:20] <@octo> tokkee: Ja, kann ich machen..
[22:21] <@tokkee> octo: Thx.
[22:21] <@tokkee> octo: Dann brauch ich wegen so was net mit patchen im Paket anfangen ;-)
[22:20] <@tokkee> octo: Koenntest du bitte im naechsten Release von collectd in das Config-File auskommentierte Bsp-Zeilen fuer "Server" und "Port" mit rein nehmen?
[22:20] <@octo> tokkee: Ja, kann ich machen..
[22:21] <@tokkee> octo: Thx.
[22:21] <@tokkee> octo: Dann brauch ich wegen so was net mit patchen im Paket anfangen ;-)
Bumped version to 3.10.1; Updated ChangeLog.
apcups plugin: Close the socket when `connect' failes.
Otherwise people will get `Too many open files' faily soon.
Otherwise people will get `Too many open files' faily soon.
debian/: Corrected the files needed for building Debian packages.
Bumped version to 3.10.0.
collectd.spec: Added the `ntpd' plugin.
Don't include the debian/ subdirectory in the distribution tarball, since Sebastian has packaged an official package.
Apparently Debian developers prefer not having this directory in the tarball..
Apparently Debian developers prefer not having this directory in the tarball..
Merge branch 'ff/traffic'
collection.cgi: Add the new network RRD-files `if_errors.rrd' and `if_packets.rrd'.
ping plugin: Updated the ping plugin to work with liboping 0.2.2.
liboping: Use `oping.h' rather than the (old) `liboping.h'.
liboping: Updated `oping.h' to version 0.2.2. This has been forgotten previously.
renamed: src/liboping/liboping.h -> src/liboping/oping.h
Merge branch 'install-config'
collectd.conf: Un-comment a valid mode using the automake mechanismn.
Don't overwrite an existing config file. Use `collectd.conf.pkg-orig' instead.
traffic plugin: Store the new `if_packets.rrd' and `if_errors.rrd' in a seperate subdirectory.
This makes it easier for user interfaces to know what host, and what a plugin
subdirectory is.
This makes it easier for user interfaces to know what host, and what a plugin
subdirectory is.
Merge branch 'collectd-3.9'
network: Be more verbose when `network_create_socket' failes due to a wrong `mode'.
On Sat, Jul 08, 2006 at 02:14:05PM +0000, Cryptronic wrote:
> collectd[6889]: network_create_socket (zensoredip, 25826) failed
if this is the only error you get, you most likely need to put
Mode Client
Somewhere before the `Listen' statement.
On Sat, Jul 08, 2006 at 02:14:05PM +0000, Cryptronic wrote:
> collectd[6889]: network_create_socket (zensoredip, 25826) failed
if this is the only error you get, you most likely need to put
Mode Client
Somewhere before the `Listen' statement.
collectd.conf: (Un)comment plugins based on the configure-setting. Install the file in `sysconfdir'.
What's not done yet is checking wether or not the (destination) file already
exists and _don't_ overwrite it.
What's not done yet is checking wether or not the (destination) file already
exists and _don't_ overwrite it.
renamed: contrib/collectd.conf -> src/collectd.conf.in
liboping: Updated liboping to version 0.2.2
Merge branch 'v39/liboping-license'
liboping: Include information about the package in the source districution.
The included files are: AUTHORS, COPYING, ChangeLog, and README
The included files are: AUTHORS, COPYING, ChangeLog, and README
traffic plugin: Documented the new optioins in collectd.conf(5).
traffic plugin: Made it possible to select/ignore certain interfaces.
Based on an idea by and a discussion with Zhuang Yuyao.
Based on an idea by and a discussion with Zhuang Yuyao.
liboping: Added license and other information.
octo@alice:~/collectd $ git add src/liboping/{AUTHORS,COPYING,ChangeLog,README}
octo@alice:~/collectd $ git add src/liboping/{AUTHORS,COPYING,ChangeLog,README}
Merge branch 'v39/libconfig-license'
libconfig: Include the license information in the distribution tarball.
Also added README and other information.
Also added README and other information.
Merge branch 'collectd-3.9'
configure.in: Bumped verion to 3.9.4.
18 years agoCorrected the date of the 3.9.4 version in `ChangeLog', `debian/changelog' and `colle...
Corrected the date of the 3.9.4 version in `ChangeLog', `debian/changelog' and `collectd.spec'.
configfile: Be more verbose if the `Server' or `Local' modes are not available.
This happends if not linking against librrd. Some people missed the summary at
the end of the configure script and the error message wasn't helping them.
This happends if not linking against librrd. Some people missed the summary at
the end of the configure script and the error message wasn't helping them.
Merge branch 'collectd-3.9'
collectd-3.9: Removed `src/libping' since it's not used.
Merge branch 'svn-trunk'
Copied missing files from the subversion repository.
ChangeLog: Added the bugfix with `operating_mode'.
Merge branch 'v393-fix' into b39-fix
Applied all the changes that `git-svnimport' missed.
Merge branch 'v392-fix' into v393-fix
Merge branch 'v391-fix' into v392-fix
Applied all the changes that `git-svnimport' missed.
Merge branch 'v390-fix' into v391-fix
Applied all the changes that `git-svnimport' missed.
Copied missing files from the subversion repository.
Set `operating_mode' to a defined state, even if not linking with librrd.
Added information about version 3.9.4 to `collectd.spec' and `debian/changelog'.
Added a ChangeLog entry about 3.9.4.
It containes information about the Solaris fixes by Christophe Kalt.
It containes information about the Solaris fixes by Christophe Kalt.
Merge branches 'processes-fix' and 'solaris-fixes'
Conflicts:
src/swap.c
Conflicts:
src/swap.c
processes plugin: Added some more error- and debug-messages.
Mostly to play with the merging of git, though ;)
Mostly to play with the merging of git, though ;)
octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk
octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
solaris-fixes branch: Change `pagesize' to be a `unsigned long long'.
Christophe Kalt is having problems with what appears to be a 32bit overflow.
This is just to make sure the multiplications with `pagesize' are not causing
this.
Christophe Kalt is having problems with what appears to be a 32bit overflow.
This is just to make sure the multiplications with `pagesize' are not causing
this.
solaris-fixes branch: Complain in the syslog if `swapctl' failes.
Shouldn't happen, but one ought to know if it does.
Shouldn't happen, but one ought to know if it does.
solaris-fixes branch: Applied the swap-patch by Christophe Kalt.
It's supposed to fix the swap plugin under Solaris, but appears to have some
problems.
It's supposed to fix the swap plugin under Solaris, but appears to have some
problems.
solaris-fixes branch: Fix the debugging output in `configfile.c'.
The Solaris libc doesn't like if you pass a NULL pointer to as the string used
with printf like formatting. This patch introduces a macro which escapes this.
The Solaris libc doesn't like if you pass a NULL pointer to as the string used
with printf like formatting. This patch introduces a macro which escapes this.
octo@leeloo:~/collectd $ svn cp tags/collectd-3.9.3 branches/solaris-fixes
disk-linux branch: Fix a bug in the disk plugin.
When `{read,write}-sectors' hit the 32 bit boundary, `atoi' would always return
LONG_MAX, resulting in the same counter-value being logged over and over again,
resulting in zero-entries in the RRD file.
Thanks to James Valente for reporting this bug and providing much debugging
information :)
When `{read,write}-sectors' hit the 32 bit boundary, `atoi' would always return
LONG_MAX, resulting in the same counter-value being logged over and over again,
resulting in zero-entries in the RRD file.
Thanks to James Valente for reporting this bug and providing much debugging
information :)
octo@casella:~/collectd $ svn cp trunk branches/disk-linux
octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk
trunk: add .gitignore
Thanks to Olaf Rempel for this patch.
Thanks to Olaf Rempel for this patch.
trunk: Added the `apcups' and the `ntpd' plugins to the `README' file.
trunk: traffic plugin: fix linux pkt/err counters
Thanks to Olaf Rempel for this patch.
Thanks to Olaf Rempel for this patch.
trunk: fix some fd-leaks
Thanks to Olaf Rempel for this patch.
Thanks to Olaf Rempel for this patch.
trunk: Updated the `collection.cgi' with the `ntpd' types.
Some ntpd-specific types have been added. The `apcups_*' types have been
removed, since the apcups-plugin uses pretty generic types that are also used
the `battery' plugin and possibly others..
Some ntpd-specific types have been added. The `apcups_*' types have been
removed, since the apcups-plugin uses pretty generic types that are also used
the `battery' plugin and possibly others..
apcups branch: Remove `write_nbytes' and replace it with `swrite'.
`swrite' is defined in `common.c' and (re)used by other plugins.
Also, use `[u]int16_t' rather than `short', since the C standard doesn't
garuantee a specific size for this storage type.
Finally, the naming of the `packet_size' variable has been unified.
`swrite' is defined in `common.c' and (re)used by other plugins.
Also, use `[u]int16_t' rather than `short', since the C standard doesn't
garuantee a specific size for this storage type.
Finally, the naming of the `packet_size' variable has been unified.
apcups branch: Removed `read_nbytes' and replaced with `sread'.
`sread' is the secure-read function provided by `common.c'. This removed
duplicate code..
`sread' is the secure-read function provided by `common.c'. This removed
duplicate code..
apcups branch: Fixed the behavior of `sread'.
If `sread' receives an EOF it will now close the file descriptor and return an
error. Prior to this revision it would try to read again and possibly fail
then.. Alternatively it might have crashed, who knows..? ;)
If `sread' receives an EOF it will now close the file descriptor and return an
error. Prior to this revision it would try to read again and possibly fail
then.. Alternatively it might have crashed, who knows..? ;)
octo@casella:~/collectd $ svn cp trunk branches/apcups
trunk: Added config options of the `apcups' plugin to the `collectd.conf' manpage.
trunk: Added configuration options for `ntpd' to the `collectd.conf' manpage.
trunk: Documentes the two new plugins, apcups and ntpd
octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk
octo@casella:~/collectd $ svn rm branches/ntpd
octo@casella:~/collectd $ svn rm branches/ntpd
octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
apcups branch: Don't close the socket after each iteration.
The apcups daemon can handle it and it's nicer to the system to just leave the
socket open, so that's what we're doing. The socket is still closed if
`APCMAIN' is defined.
The apcups daemon can handle it and it's nicer to the system to just leave the
socket open, so that's what we're doing. The socket is still closed if
`APCMAIN' is defined.
apcups branch: Some debug messages and such.
collectd dies when the port is forwarded using ssh and then the server exits.
Apparently ssh doesn't anser with a connection refused right away which may
result in problems..
This revision adds some debug messages and handles `EOF' correctly (when
reading).
collectd dies when the port is forwarded using ssh and then the server exits.
Apparently ssh doesn't anser with a connection refused right away which may
result in problems..
This revision adds some debug messages and handles `EOF' correctly (when
reading).
ntpd branch: Changed the RRD files of the NTPd plugin to store seconds rather than milliseconds.
Apparently seconds is what we get. I was assuming it was milliseconds for some
unknown reason..
Apparently seconds is what we get. I was assuming it was milliseconds for some
unknown reason..
apcups branch: Renames some RRD files and DSes.
The `charge_percent' has been renamed to `load_percent' because it's actually
the load on the UPS, not the charge.
The `charge' file has been renamed to `charge_percent', because the values are
in percent, not Ah.
The `charge_percent' has been renamed to `load_percent' because it's actually
the load on the UPS, not the charge.
The `charge' file has been renamed to `charge_percent', because the values are
in percent, not Ah.