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

[Florian Forster]

 src/collectdmon.c |   12 ++++++------
 src/write_redis.c |    6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ced4663d20fba65f3966fd2dfbe23a53fc16df37
Merge: ea29832 a37bd9e
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue May 15 12:43:45 2018 +0200

    Merge pull request #2774 from takahashi-tsc/bugfix-collectdmon-loop
    
    Fix collecdmon not start collectd

commit ea2983299710c1a3b7886ab6aa460818e091076f
Merge: b4a2f3e a3bafd5
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue May 15 12:40:57 2018 +0200

    Merge pull request #2773 from takahashi-tsc/bugfix-writeredis-duration
    
    write_redis: fix "max_set_duration" deletes unexpected data

commit a37bd9e2b8940891d61d04bda76065fab4d7d152
Author: Toshiaki Takahashi <takahashi.tsc at ncos.nec.co.jp>
Date:   Tue May 15 09:25:29 2018 +0000

    run contrib/format.sh src/collectdmon.c

commit 75c754890b7e23230ff353608e2a1acf16ede437
Author: Toshiaki Takahashi <takahashi.tsc at ncos.nec.co.jp>
Date:   Tue May 15 09:06:16 2018 +0000

    Fix collecdmon not start collectd
    
    Because collectdmon cannot exit parse command line options loop,
    it cannot execute collectd start processing.

commit a3bafd5a952b5cfacacb03f9fb2ac5988d1e39fb
Author: Toshiaki Takahashi <takahashi.tsc at ncos.nec.co.jp>
Date:   Tue May 15 07:19:25 2018 +0000

    write_redis: fix "max_set_duration" deletes unexpected data
    
    The calculation result of the data range
    when "max_set_duration" is used is incorrect,
    because the (char []) type, i.e. string, variable "time" is used
    as the number for the time calculation.
    As a result, data in the wrong range is deleted.
    With this change, the correct data is deleted
    by calculation using a double type value.

commit b4a2f3eb563332d43a25791ee7856cb0817ae95e
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue May 15 09:46:01 2018 +0200

    collectdmon: fix build failure on Xenial
    
    CC       src/collectdmon.o
    src/collectdmon.c:262:44: error: comparison of unsigned expression >= 0 is always true [-Werror,-Wtautological-compare]
        while (((time_left = sleep(time_left)) >= 0) && loop == 0)
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~
    1 error generated.