From: Florian Forster Date: Fri, 24 Aug 2007 10:12:40 +0000 (+0200) Subject: Merge branch 'pull/collectd-4.0' into collectd-4.0 X-Git-Tag: collectd-4.0.7~6 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=29a9c44c3599a44d55dbb0157aa61c04ac175206;hp=805c49402bce0fa123639d3476913d2bb5713c90;p=collectd.git Merge branch 'pull/collectd-4.0' into collectd-4.0 --- diff --git a/README b/README index 84ca772f..6f59a7a0 100644 --- a/README +++ b/README @@ -295,6 +295,17 @@ Crosscompiling are likely never passed to the libm you have a good chance to be lucky. +Contact +------- + + For questions, bugreports, development information and basically all other + concerns please send an email to collectd's mailinglist at + . + + For live discussion and more personal contact visit us in IRC, we're in + channel #collectd on freenode. + + Author ------ @@ -302,3 +313,5 @@ Author Sebastian tokkee Harl , and many contributors (see `AUTHORS'). + Please send bugreports and patches to the mailinglist, see `Contact' above. + diff --git a/contrib/collectd2html.pl b/contrib/collectd2html.pl index 6ff1c479..da143d70 100644 --- a/contrib/collectd2html.pl +++ b/contrib/collectd2html.pl @@ -36,12 +36,20 @@ use warnings; use strict; use Fatal qw(open close); use File::Basename; +use Getopt::Long qw(:config no_ignore_case bundling pass_through); + +my $DIR = "/var/lib/collectd"; +my $HOST = "_UNDEFINED_"; + +GetOptions ( + "host-is=s" => \$HOST, + "data-dir=s" => \$DIR +); -my $DIR = "/var/lib/collectd"; my @COLORS = (0xff7777, 0x7777ff, 0x55ff55, 0xffcc77, 0xff77ff, 0x77ffff, 0xffff77, 0x55aaff); my @tmp = `/bin/hostname`; chomp(@tmp); -my $HOST = $tmp[0]; +$HOST = $tmp[0] if ( $HOST =~ /_UNDEFINED_/ ); my $IMG_DIR = "${HOST}.dir"; my $HTML = "${HOST}.html"; diff --git a/src/network.c b/src/network.c index 34385bf6..84e77733 100644 --- a/src/network.c +++ b/src/network.c @@ -1232,7 +1232,11 @@ static int network_config (const char *key, const char *val) && (fields_num != 2)) return (1); else if (fields_num == 2) + { + if ((service = strchr (fields[1], '.')) != NULL) + *service = '\0'; service = fields[1]; + } node = fields[0]; if (strcasecmp ("Listen", key) == 0)