[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

Florian Forster octo at verplant.org
Wed Mar 26 09:56:53 CET 2008 

 bindings/perl/Collectd/Unixsock.pm |    4 -
 contrib/cussh.pl                   |   87 ++++++++++++++++++++++++-----
 src/collectd-unixsock.pod          |   66 ++++++++++------------
 src/unixsock.c                     |   35 +++++++----
 src/utils_cmd_flush.c              |  111 +++++++++++--------------------------
 src/utils_cmd_getval.c             |   28 ++++++---
 src/utils_cmd_listval.c            |    2 
 src/utils_cmd_putnotif.c           |    2 
 src/utils_cmd_putval.c             |   26 ++++++--
 9 files changed, 202 insertions(+), 159 deletions(-)

New commits:
commit e096f0f1cd96f48533c38c554b342d749d2ac51a
Merge: e8fc151794f5e3ca5c86259dbe201c41bae861d0 e88e5b49dd3cc026d162b64ca100415481756169
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Mar 26 09:56:48 2008 +0100

    Merge branch 'collectd-4.3'

commit e8fc151794f5e3ca5c86259dbe201c41bae861d0
Merge: a2ef6243e563dae68c71d58c1d9af924a5817e5a ef493fef09db7227dcaedc2a3cae4a4a1ee4e1a9
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Mar 26 09:56:41 2008 +0100

    Merge branch 'pull/master'

commit e88e5b49dd3cc026d162b64ca100415481756169
Merge: bc0a8f260e4e24bdf664c3dcff919b6f99bfe31d 3bb58d8d87a0db2b3177cbc52c2078c5543e7944
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Mar 26 09:56:22 2008 +0100

    Merge branch 'pull/collectd-4.3' into collectd-4.3

commit a2ef6243e563dae68c71d58c1d9af924a5817e5a
Merge: 43df21461d523023951746ef669f1bb95f61366d bc0a8f260e4e24bdf664c3dcff919b6f99bfe31d
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Mar 26 09:52:25 2008 +0100

    Merge branch 'collectd-4.3'
    
    Conflicts:
    
    	src/unixsock.c

commit bc0a8f260e4e24bdf664c3dcff919b6f99bfe31d
Merge: ac03ae49d85c01fe2da58dd78f66db58416d81cc 583b04d5826669eb182cb6ea538cf68266721ccb
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Mar 26 09:48:27 2008 +0100

    Merge branch 'collectd-4.2' into collectd-4.3
    
    Conflicts:
    
    	src/unixsock.c

commit 583b04d5826669eb182cb6ea538cf68266721ccb
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Mar 26 09:44:04 2008 +0100

    unixsock plugin: Open two different IO stream handles for reading and writing.
    
    Full-duplex standard IO streams are not really supported on sockets.
    Mixing input and output functions involves calls to lseek(2) which is
    not supported on sockets and thus causes the IO operations to fail.
    Opening two IO streams solves the problem.
    
    This is a backport of 43df21461d523023951746ef669f1bb95f61366d.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit ac03ae49d85c01fe2da58dd78f66db58416d81cc
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Mar 26 09:42:56 2008 +0100

    unixsock plugin: Open two different IO stream handles for reading and writing.
    
    Full-duplex standard IO streams are not really supported on sockets.
    Mixing input and output functions involves calls to lseek(2) which is
    not supported on sockets and thus causes the IO operations to fail.
    Opening two IO streams solves the problem.
    
    This is a backport of 43df21461d523023951746ef669f1bb95f61366d.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 43df21461d523023951746ef669f1bb95f61366d
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Mar 25 19:58:20 2008 +0100

    unixsock plugin: Open two different IO stream handles for reading and writing.
    
    Full-duplex standard IO streams are not really supported on sockets.
    Mixing input and output functions involves calls to lseek(2) which is
    not supported on sockets and thus causes the IO operations to fail.
    Opening two IO streams solves the problem.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 0b40e1fbdc404d980cb6b4256d9ff6ba6ab94bb8
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Mar 25 19:31:37 2008 +0100

    contrib/cussh.pl: Fixed input line parsing.
    
    The regexes parsing the user input lines have been adopted to take into
    account that the newline at the end of the line has been removed.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 738e046e5ed131f0ba84cf0c87a2f0818da8bb44
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Mar 25 15:59:40 2008 +0100

    contrib/cussh.pl: Added support for LISTVAL.
    
    Also fixed the following minor problems:
     * the arguments passed to Collectd::Unixsock::putval() have been updated
       to the current version of the Perl module
     * remove newlines from the end of the input line - the unixsock plugin
       currently seems to be buggy when receiving two newlines in a row
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit c08e3ed48857ef9997e8ef3bb40c0a982319106b
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Mar 25 15:58:47 2008 +0100

    Collectd::Unixsock: Fixed some typos.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 4a005f01e9ba4322bdb41631928ecc9edf51b189
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Mar 26 09:34:14 2008 +0100

    utils_cmd_{get,put}val.c: Fixed usage of parse_identifier().
    
    This function modifies its first argument which, in these cases, is used
    again after the function call. Now, a copy of the string is passed to
    parse_identifier().
    
    This is a backport of 0a905cbd3151716c5749b5e7c5e439861466804d.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 0a905cbd3151716c5749b5e7c5e439861466804d
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Mar 25 15:58:15 2008 +0100

    utils_cmd_{get,put}val.c: Fixed usage of parse_identifier().
    
    This function modifies its first argument which, in these cases, is used
    again after the function call. Now, a copy of the string is passed to
    parse_identifier().
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit ebbe15f56430838df4397150f6c3089d5851216d
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Mar 26 09:31:33 2008 +0100

    utils_cmd_*: Terminate all lines printed to the socket with newline.
    
    This is a backport of 1ca0b79a4274784e4cc15d45e46e2cfa0c2039cf.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 1ca0b79a4274784e4cc15d45e46e2cfa0c2039cf
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Mar 25 15:56:59 2008 +0100

    utils_cmd_*: Terminate all lines printed to the socket with newline.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 90287c6d240a168fca8d01f8330e2e2263e1f0a4
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Mar 26 09:28:40 2008 +0100

    Disambiguated the protocol used by the unixsock (and other) plugins.
    
    As discussed with Florian on IRC, the interpretation of the status line
    returned by the unixsock plugin (et.al.) is now strictly specified. A status
    greater than or equal to zero indicates success and the number of subsequent
    lines of output. A negative status still indicates failure.
    
    This way, frontends can manage the output without having to know any
    command-specific interpretation rules.
    
    The GETVAL command has been updated to implement this specification. It now
    returns each value on a separate line. collectd-unixsock(5) has been updated
    to reflect the changes.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 056474c91e21ff051d2851f7a07e4f83b7e6d74f
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Mar 25 15:53:45 2008 +0100

    utils_cmd_flush.c: Simplified / improved option parsing.
    
    Instead of parsing all options before doing any work, each option is now
    handled right after it has been parsed. This has the following benefits:
    
     * No need to allocate and construct any data structures.
     * The timeout option may be used multiple times now, only affecting any
       plugins listed after this.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 271529f9b39a00f28d81b3ed40f0fdcab2c795d0
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Mar 25 15:52:47 2008 +0100

    collectd-unixsock(5): Updated the paragraph about Collectd::Unixsock.
    
    The module is no longer available in contrib/PerlLib/ but bindings/perl/.
    Also it's now installed by default.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

More information about the collectd-changes mailing list