In the continuing saga of the namespace bugs I created in Cricket
0.68, here's a new copy of file.pm which you should install into your
copy of Cricket 0.68 if you use the "file" ds-source anywhere in your
config tree.
I will be releasing Cricket 0.69 tomorrow with all of these bugfixes I
have been sending in the last few days. Sorry it's gotten a little
unstable recently -- it should be fixed soon.
-- Jeff R. Allen | jra@corp.webtv.net WebTV Service Engineering | http://www.munitions.com/~jra
# -*-perl-*-
# Cricket: a configuration, polling and data display wrapper for RRD files # # Copyright (C) 1998 Jeff R. Allen and WebTV Networks, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
use Common::Log;
$main::gDSFetch{'file'} = \&fileFetch;
sub fileFetch { # This procedure is passed a REFERENCE to an array of file datasources. # The line consists of "index:line-num:shell command" # # There can and will be spaces in the shell command. If line-num # is missing it is assumed to be the first output line. # # VERY IMPORTANT: The index MUST be returned with the corresponding value, # otherwise it'll get put back into the wrong spot in the RRD.
my($dsList, $name, $target) = @_;
my(@results, %files);
my($line); foreach $line (@{$dsList}) { my(@components) = split(/:/, $line, 3); my($index, $lineno, $file);
if ($#components+1 == 3) { ($index, $lineno, $file) = @components; } elsif ($#components == 1) { ($index, $file) = @components; $lineno = 0; } else { Error("Malformed datasource source: $line."); return (); } push(@{ $files{$file} }, "$index:$lineno"); }
my($file, $ilRef, $il);
while (($file, $ilRef) = each %files) { Info("Reading data from $file for " . $target->{'auto-target-name'});
if (open(F, "<$file")) { my(@lines); chomp(@lines = <F>); close(F);
while ($il = shift @{ $ilRef } ) { my($index, $lineno) = split(/:/, $il, 2); if (defined($lines[$lineno])) { push @results, "$index:$lines[$lineno]"; } else { push @results, "$index:U"; } } } else { Error("Could not fetch data for " . $target->{'auto-target-name'} . " from file $file: $!."); } }
return @results; }
1;
This archive was generated by hypermail 2b29 : Mon Mar 06 2000 - 19:00:56 PST