Index: ossp-pkg/snmpdx/00BRAINSTORM RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/00BRAINSTORM,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/snmpdx/00BRAINSTORM,v' 2>/dev/null --- 00BRAINSTORM 2003/09/01 15:22:41 1.1 +++ 00BRAINSTORM 2003/09/10 13:30:47 1.2 @@ -1,43 +1,19 @@ + _ ___ ____ ____ ____ _ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ _ __ _ __ ___ _ __ __| |_ __ + _|_||_| | | | \___ \___ \| |_) | / __| '_ \| '_ ` _ \| '_ \ / _` \ \/ / + |_||_|_| | |_| |___) |__) | __/ \__ \ | | | | | | | | |_) | (_| |> < + |_|_|_| \___/|____/____/|_| |___/_| |_|_| |_| |_| .__/ \__,_/_/\_\ + |_| + OSSP snmpdx - SNMP Daemon Extension -Sitzt Michael schon an der SNMP-Geschichte? Wir haben bereits am Mittwoch -ein Folgemeeting, er waere gut, bis dahin erste Resultate zu haben. Ziel -ist es, von einer (zu schaffenden) Montoring Platform bestehend aus zwei -Sun Netra t1 ueber das Backup-LAN Hardware-Monitoring mittels SNMP zu -fahren. Die Netras werden auch von uns bereitgestellt, ich will diese dem -Zet.Net-Setup entnehmen. Dazu fehlt mir jedoch die Freigabe von Assuntina -Greco (Bill & Collect), welche jedoch erst zum 1.9. wieder da sein wird. - -Deshalb sollten wir uns erst mal auf die Client-Seite konzentriert werden. -Hierzu muss eine MIB entwickelt werden, mit der sich Parameter wir -Netzteil-Status (jeweils 1 oder mehrere), Plattenstatus (jeweils 1 oder -mehrere), Temperatur (jeweils 1 oder mehrere) etc. abfragen lassen. Wir -sollten erst einmal eine Referenzloesung und Sun Solaris schaffen. -Notwendige Punkte sind daher wohl - -o Config fuer den SNMP-Daemon aus OpenPKG, welcher diesen nur am - Backup-Interface listenen laesst. -o Entwicklung von MIB und Skripten, mit der sich die relevanten - Information extrahieren lassen (wahrscheinlich output von prtdiag - parsen. Wie wir wissen, kann der output von prtdiag je nach Platform - stark abweichen) -o Erweiterbarkeit der Loesung um andere Platformen, etwa Linux oder - Windows (natuerlich nicht mit OpenPKG :-) muss gegeben sein. -o Waere es evtl. sinnvoll, die Skripte nicht direct durch den SNMP Daemon - triggern zu lassen, insofern Daten lokal gecached bereits vorliegen? - Der Cache koennte etwa eine RRD sein, welche durch cronjobs gespeist - wird. So koennte man die Informationen noch evtl. anderweitig lokal - nutzen (evtl. Reanimierung von poor man's monitoring probes sinnvoll?) - -Es sollen keine Traps ausgeloest werden, die Monitoring-Platform, auf der -dann ein BMC Agent laufen soll, pollt regelmaessig. - + BRAINSTORM + ========== * 1.3 - ISO Identified Organization * 1.3.6 - US Department of Defense * 1.3.6.1 - OID assignments from 1.3.6.1 - Internet * 1.3.6.1.4 - Internet Private * 1.3.6.1.4.1 - IANA-registered Private Enterprises -* 1.3.6.1.4.1.2021 - RedHat Linux * 1.3.6.1.4.1.4007 - Cable & Wireless Plc Cable & Wireless Communications plc Brian Norris @@ -47,8 +23,7 @@ http://www.iana.org/cgi-bin/enterprise.pl http://www.alvestrand.no/objectid/top.html -{iso(1) org(3) dod(6) iana(1)} - +----------------------------------------------------------------------- pass .1.3.6.1.4.1.2021.255 /path/to/probe $ /path/to/probe -g .1.3.6.1.4.1.2021.255 @@ -108,7 +83,7 @@ - uptime - load average (5/10/15) - processes - - logged in users + - logged in users - virtual memory - swap space (available/used) - RAM space (available/used) @@ -122,24 +97,3 @@ o Processes (running) - running ------------------------- - -FreeBSD: -/proc -sysctl -df -netstat -ps - -Linux: -/proc -sysctl -df -netstat -ps -/proc/meminfo - -Solaris: -prtdiag -/usr/sbin/sysdef - Index: ossp-pkg/snmpdx/00TODO RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/00TODO,v rcsdiff -q -kk '-r1.10' '-r1.11' -u '/v/ossp/cvs/ossp-pkg/snmpdx/00TODO,v' 2>/dev/null --- 00TODO 2003/09/10 13:10:22 1.10 +++ 00TODO 2003/09/10 13:30:47 1.11 @@ -1,24 +1,33 @@ + _ ___ ____ ____ ____ _ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ _ __ _ __ ___ _ __ __| |_ __ + _|_||_| | | | \___ \___ \| |_) | / __| '_ \| '_ ` _ \| '_ \ / _` \ \/ / + |_||_|_| | |_| |___) |__) | __/ \__ \ | | | | | | | | |_) | (_| |> < + |_|_|_| \___/|____/____/|_| |___/_| |_|_| |_| |_| .__/ \__,_/_/\_\ + |_| + OSSP snmpdx - SNMP Daemon Extension -TODO -==== + TODO + ==== -- implement more probes [thl] -- write snmpdx.pod documentation + - snmp mibs dir was lost -CANDO -===== + - implement more probes [thl] + - write snmpdx.pod documentation -- allow two modules to run and cache the same command with different - expire times by using/enforcing the smaller expire time in the cache object. -- speed up initial MIB processing by trying to consolidate snmptranslate calls? -- write probe snmpdx.pm which provides name and version and which - especially can be also used as the always present probe in Makefile - during restart. -- add --param=key:value command line option for passing key/value - pairs into snmpdx for use by probes as some sort of configuration. -- provide "-expire" field in $obj which the probes can fill out. - If filled out, the framework uses this to cache the result - value to speed up things even more. -- split out MIB parts of each probe into own sub-MIBs -- Makefile and snmpdx.cfg still contains some hard-coded things + CANDO + ===== + + - allow two modules to run and cache the same command with different + expire times by using/enforcing the smaller expire time in the cache object. + - speed up initial MIB processing by trying to consolidate snmptranslate calls? + - write probe snmpdx.pm which provides name and version and which + especially can be also used as the always present probe in Makefile + during restart. + - add --param=key:value command line option for passing key/value + pairs into snmpdx for use by probes as some sort of configuration. + - provide "-expire" field in $obj which the probes can fill out. + If filled out, the framework uses this to cache the result + value to speed up things even more. + - split out MIB parts of each probe into own sub-MIBs + - Makefile and snmpdx.cfg still contains some hard-coded things Index: ossp-pkg/snmpdx/AUTHORS RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/AUTHORS,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/snmpdx/AUTHORS,v' 2>/dev/null --- AUTHORS 2003/09/09 14:16:25 1.6 +++ AUTHORS 2003/09/10 13:30:47 1.7 @@ -1,19 +1,19 @@ - _ ___ ____ ____ ____ - |_|_ _ / _ \/ ___/ ___|| _ \ - _|_||_| | | | \___ \___ \| |_) | - |_||_|_| | |_| |___) |__) | __/ - |_|_|_| \___/|____/____/|_| - + _ ___ ____ ____ ____ _ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ _ __ _ __ ___ _ __ __| |_ __ + _|_||_| | | | \___ \___ \| |_) | / __| '_ \| '_ ` _ \| '_ \ / _` \ \/ / + |_||_|_| | |_| |___) |__) | __/ \__ \ | | | | | | | | |_) | (_| |> < + |_|_|_| \___/|____/____/|_| |___/_| |_|_| |_| |_| .__/ \__,_/_/\_\ + |_| OSSP snmpdx - SNMP Daemon Extension Version 0.2.4 (09-Sep-2003) ____________________________________________________________________ AUTHORS - This is a list of authors who have written or edited parts of + This is a list of authors who have written or edited parts of the OSSP snmpdx sources. o OSSP snmpdx (as a whole) - Written by: Ralf S. Engelschall - Thomas Lotterer - + Written by: Ralf S. Engelschall + Thomas Lotterer + Index: ossp-pkg/snmpdx/ChangeLog RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/ChangeLog,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/snmpdx/ChangeLog,v' 2>/dev/null --- ChangeLog 2003/09/09 14:16:25 1.6 +++ ChangeLog 2003/09/10 13:30:47 1.7 @@ -1,20 +1,25 @@ - _ ___ ____ ____ ____ - |_|_ _ / _ \/ ___/ ___|| _ \ - _|_||_| | | | \___ \___ \| |_) | - |_||_|_| | |_| |___) |__) | __/ - |_|_|_| \___/|____/____/|_| - + _ ___ ____ ____ ____ _ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ _ __ _ __ ___ _ __ __| |_ __ + _|_||_| | | | \___ \___ \| |_) | / __| '_ \| '_ ` _ \| '_ \ / _` \ \/ / + |_||_|_| | |_| |___) |__) | __/ \__ \ | | | | | | | | |_) | (_| |> < + |_|_|_| \___/|____/____/|_| |___/_| |_|_| |_| |_| .__/ \__,_/_/\_\ + |_| OSSP snmpdx - SNMP Daemon Extension - Version 0.2.4 (09-Sep-2003) - ____________________________________________________________________ ChangeLog - Changes between 0.1.0 and 0.2.0 (9-Sep-2003): + Changes between 0.2.0 and 0.2.4 (09-Sep-2003): + + *) Lot's of fiddling with the build environment. + [Thomas Lotterer] + + Changes between 0.1.0 and 0.2.0 (09-Sep-2003): + *) Build environment, OpenPKG package [Thomas Lotterer] - Changes between *GENESIS* and 0.1.0 (Aug-2003 to 9-Sep-2003): + Changes between *GENESIS* and 0.1.0 (xx-Aug-2003 to 09-Sep-2003): + *) Framework and initial probes [Ralf S. Engelschall] Index: ossp-pkg/snmpdx/INSTALL RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/INSTALL,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/snmpdx/INSTALL,v' 2>/dev/null --- INSTALL 2003/09/09 14:16:25 1.6 +++ INSTALL 2003/09/10 13:30:47 1.7 @@ -1,14 +1,13 @@ - _ ___ ____ ____ ____ - |_|_ _ / _ \/ ___/ ___|| _ \ - _|_||_| | | | \___ \___ \| |_) | - |_||_|_| | |_| |___) |__) | __/ - |_|_|_| \___/|____/____/|_| - + _ ___ ____ ____ ____ _ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ _ __ _ __ ___ _ __ __| |_ __ + _|_||_| | | | \___ \___ \| |_) | / __| '_ \| '_ ` _ \| '_ \ / _` \ \/ / + |_||_|_| | |_| |___) |__) | __/ \__ \ | | | | | | | | |_) | (_| |> < + |_|_|_| \___/|____/____/|_| |___/_| |_|_| |_| |_| .__/ \__,_/_/\_\ + |_| OSSP snmpdx - SNMP Daemon Extension - Version 0.2.4 (09-Sep-2003) - ____________________________________________________________________ INSTALLATION - + ============ + FIXME Index: ossp-pkg/snmpdx/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/Makefile.in,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/snmpdx/Makefile.in,v' 2>/dev/null --- Makefile.in 2003/09/09 14:16:17 1.5 +++ Makefile.in 2003/09/10 13:30:47 1.6 @@ -3,14 +3,14 @@ ## ## Copyright (c) 2003 Ralf S. Engelschall ## Copyright (c) 2003 The OSSP Project -## Copyright (c) 2003 Cable & Wireless Germany +## Copyright (c) 2003 Cable & Wireless ## ## This file is part of OSSP snmpd, a SNMP Daemon Extension which ## can be found at http://www.ossp.org/pkg/tool/snmpdx/. ## ## 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 +## modify it under the terms of the GNU General Public License +## as published by the Free Software Foundation; either version ## 2.0 of the License, or (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -18,7 +18,7 @@ ## 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 +## You should have received a copy of the GNU General Public License ## along with this file; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ## USA, or contact Ralf S. Engelschall . @@ -34,7 +34,7 @@ SED = sed POD2MAN = pod2man PERL = @PATH_PERL@ - + prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ Index: ossp-pkg/snmpdx/README RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/README,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/snmpdx/README,v' 2>/dev/null --- README 2003/09/09 14:16:25 1.6 +++ README 2003/09/10 13:30:47 1.7 @@ -1,11 +1,11 @@ - _ ___ ____ ____ ____ - |_|_ _ / _ \/ ___/ ___|| _ \ - _|_||_| | | | \___ \___ \| |_) | - |_||_|_| | |_| |___) |__) | __/ - |_|_|_| \___/|____/____/|_| - + _ ___ ____ ____ ____ _ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ _ __ _ __ ___ _ __ __| |_ __ + _|_||_| | | | \___ \___ \| |_) | / __| '_ \| '_ ` _ \| '_ \ / _` \ \/ / + |_||_|_| | |_| |___) |__) | __/ \__ \ | | | | | | | | |_) | (_| |> < + |_|_|_| \___/|____/____/|_| |___/_| |_|_| |_| |_| .__/ \__,_/_/\_\ + |_| OSSP snmpdx - SNMP Daemon Extension - Version 0.2.4 (09-Sep-2003) + Version 0.2.5 (10-Sep-2003) ABSTRACT @@ -18,7 +18,7 @@ Copyright (c) 2003 Ralf S. Engelschall Copyright (c) 2003 The OSSP Project - Copyright (c) 2003 Cable & Wireless Germany + Copyright (c) 2003 Cable & Wireless This file is part of OSSP snmpd, a SNMP Daemon Extension which can be found at http://www.ossp.org/pkg/tool/snmpdx/. Index: ossp-pkg/snmpdx/THANKS RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/THANKS,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/snmpdx/THANKS,v' 2>/dev/null --- THANKS 2003/09/09 14:16:25 1.6 +++ THANKS 2003/09/10 13:30:47 1.7 @@ -1,19 +1,18 @@ - _ ___ ____ ____ ____ - |_|_ _ / _ \/ ___/ ___|| _ \ - _|_||_| | | | \___ \___ \| |_) | - |_||_|_| | |_| |___) |__) | __/ - |_|_|_| \___/|____/____/|_| - + _ ___ ____ ____ ____ _ + |_|_ _ / _ \/ ___/ ___|| _ \ ___ _ __ _ __ ___ _ __ __| |_ __ + _|_||_| | | | \___ \___ \| |_) | / __| '_ \| '_ ` _ \| '_ \ / _` \ \/ / + |_||_|_| | |_| |___) |__) | __/ \__ \ | | | | | | | | |_) | (_| |> < + |_|_|_| \___/|____/____/|_| |___/_| |_|_| |_| |_| .__/ \__,_/_/\_\ + |_| OSSP snmpdx - SNMP Daemon Extension - Version 0.2.4 (09-Sep-2003) - ____________________________________________________________________ - + THANKS + ====== Credit has to be given to the following people who contributed ideas, stuff, bugfixes, hints etc. (in alphabetical order): o Christoph Schug - ...and all other OSSP snmpd users who gave me feedback but I've forgot. + ...and all other OSSP snmpdx users who gave me feedback but I've forgot. Index: ossp-pkg/snmpdx/VERSION RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/VERSION,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/snmpdx/VERSION,v' 2>/dev/null --- VERSION 2003/09/09 14:16:25 1.5 +++ VERSION 2003/09/10 13:30:47 1.6 @@ -1,18 +1,6 @@ -## -## VERSION -- Version Information for OSSP snmpdx (syntax: Perl) -## [automatically generated and maintained by GNU shtool] -## -my $snmpdx_version = { - 'v_hex' => 0x002204, - 'v_short' => "0.2.4", - 'v_long' => "0.2.4 (09-Sep-2003)", - 'v_tex' => "This is OSSP snmpdx, Version 0.2.4 (09-Sep-2003)", - 'v_gnu' => "OSSP snmpdx 0.2.4 (09-Sep-2003)", - 'v_web' => "OSSP snmpdx/0.2.4", - 'v_sccs' => "@(#)OSSP snmpdx 0.2.4 (09-Sep-2003)", - 'v_rcs' => "\$Id$/" -}; + VERSION -- Version Information for OSSP snmpdx (syntax: Text) + [automatically generated and maintained by GNU shtool] -1; + This is OSSP snmpdx, Version 0.2.5 (10-Sep-2003) Index: ossp-pkg/snmpdx/configure.ac RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/configure.ac,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/snmpdx/configure.ac,v' 2>/dev/null --- configure.ac 2003/09/09 12:50:04 1.2 +++ configure.ac 2003/09/10 13:30:47 1.3 @@ -1,16 +1,15 @@ ## ## OSSP snmpdx - SNMP Daemon Extension -## ## Copyright (c) 2003 Ralf S. Engelschall ## Copyright (c) 2003 The OSSP Project -## Copyright (c) 2003 Cable & Wireless Germany +## Copyright (c) 2003 Cable & Wireless ## ## This file is part of OSSP snmpd, a SNMP Daemon Extension which ## can be found at http://www.ossp.org/pkg/tool/snmpdx/. ## ## 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 +## modify it under the terms of the GNU General Public License +## as published by the Free Software Foundation; either version ## 2.0 of the License, or (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -18,7 +17,7 @@ ## 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 +## You should have received a copy of the GNU General Public License ## along with this file; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ## USA, or contact Ralf S. Engelschall . @@ -33,7 +32,7 @@ ./shtool echo -e "Configuring %BOSSP snmpdx%b, Version %B${V}%b" echo "Copyright (c) 2003 Ralf S. Engelschall " echo "Copyright (c) 2003 The OSSP Project " -echo "Copyright (c) 2003 Cable & Wireless Germany " +echo "Copyright (c) 2003 Cable & Wireless " AC_MSG_CHECKING(for Perl program) AC_ARG_WITH(perl,dnl @@ -49,7 +48,6 @@ AC_SET_MAKE -##AC_CONFIG_HEADERS(config.h) AC_CONFIG_FILES([Makefile]) AC_OUTPUT Index: ossp-pkg/snmpdx/devtool.conf RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/devtool.conf,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/snmpdx/devtool.conf,v' 2>/dev/null --- devtool.conf 2003/09/09 09:28:36 1.2 +++ devtool.conf 2003/09/10 13:30:47 1.3 @@ -8,7 +8,6 @@ %autoclean @autoclean shtool - @autoclean libtool @autoclean autoconf %configure @@ -23,14 +22,12 @@ ./devtool upload %version - ./shtool version -lperl -n "OSSP snmpdx" -p "snmpdx_" -e VERSION - V=`./shtool version -lperl -dlong VERSION` - for i in AUTHORS ChangeLog INSTALL README THANKS; do - sed -e "s/ Version .*/ Version $V/g" <$i >$i.n && mv $i.n $i - done + ./shtool version -ltxt -n "OSSP snmpdx" -p "snmpdx_" -e VERSION + V=`./shtool version -ltxt -dlong VERSION` + sed -e "s/ Version .*/ Version $V/g" README.n && mv README.n README %tag - V=`./shtool version -lc -dshort VERSION | sed -e 's;\.;_;g'` + V=`./shtool version -ltxt -dshort VERSION | sed -e 's;\.;_;g'` echo "+++ tagging CVS sources as SNMPDX_${V}" cvs commit -m 'flush pending changes before tagging' cvs tag SNMPDX_${V} @@ -52,7 +49,7 @@ echo "+++ rolling" V=`./shtool version -lc -dshort VERSION` ./shtool tarball -o snmpdx-${V}.tar.gz -d snmpdx-${V} -u ossp -g ossp \ - -e 'CVS,\.cvsignore,\.[ao]$,^\.,devtool*,*.tar.gz,^#.*,.*~$' -c 'gzip --best' . + -e '00*,CVS,\.cvsignore,\.[ao]$,^\.,devtool*,*.tar.gz,^#.*,.*~$' -c 'gzip --best' . ls -l snmpdx-${V}.tar.gz echo "+++ testing" gunzip /dev/null --- devtool.func 2003/09/09 09:24:28 1.1 +++ devtool.func 2003/09/10 13:30:47 1.2 @@ -32,7 +32,7 @@ autoconf_version=`devtool_require autoconf --version 4 "$1" "$2"` echo "generating (GNU Autoconf $autoconf_version): configure config.h.in" autoconf - autoheader 2>&1 | grep -v "is unchanged" + #autoheader 2>&1 | grep -v "is unchanged" rm -rf autom4te.cache >/dev/null 2>&1 ;; libtool ) Index: ossp-pkg/snmpdx/snmpdx.pl RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.pl,v rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.pl,v' 2>/dev/null --- snmpdx.pl 2003/09/09 14:08:29 1.4 +++ snmpdx.pl 2003/09/10 13:30:47 1.5 @@ -84,7 +84,7 @@ my $fmt = shift @_ || die "missing format argument"; if ($self->{-level} >= $level) { my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime(time()); - my $id = sprintf("[%04d-%02d-%02d/%02d:%02d:%02d@%05d] ", + my $id = sprintf("[%04d-%02d-%02d/%02d:%02d:%02d@%05d] ", $year+1900, $mon+1, $mday, $hour, $min, $sec, $$); $self->{-io}->printf($id . $fmt . "\n", @_); } @@ -204,11 +204,11 @@ } else { $self->{-log}->printf(3, "system: run: \"$cmd\" ($expires) [CACHE MISS]"); - $self->{-log}->printf(5, "system: executing command: \"$cmd\""); + $self->{-log}->printf(5, "system: executing command: \"$cmd\""); $result = { -stdout => '', -rv => 0 }; $result->{-stdout} = `$cmd 2>/dev/null`; $result->{-rv} = ($? >> 8); - $self->{-log}->printf(6, "system: return value: ". $result->{-rv}); + $self->{-log}->printf(6, "system: return value: ". $result->{-rv}); $self->{-cache}->store($cmd, $expires, $result); } return $result; @@ -487,7 +487,7 @@ 'bindir' => "/cw/bin", 'probedir' => "@libexecdir@/snmpdx", 'probename' => "*", - 'mibdir' => "@datadir@/snmpdx/mibs", + 'mibdir' => "@datadir@/snmpdx/mibs", # FIXME 'mibname' => "snmpdx", 'logfile' => "@localstatedir@/snmpdx.log", 'loglevel' => 9, @@ -549,7 +549,7 @@ my ($option, $value) = ($line =~ m|^\s*(\S+)\s+(.+?)\s*$|s); die "invalid configuration line \"$line\"" if (not defined($option) or not defined($value)); - my ($var) = map { $options{$_} } + my ($var) = map { $options{$_} } grep { $_ =~ m/^.\|\Q$option\E(=[si])?$/s } keys(%options); die "invalid configuration option \"$option\"" @@ -575,7 +575,7 @@ $prg->{'name'}, $prg->{'version'}, $prg->{'date'}, $ctx->{-platform}->id()); -# exception handling support +# exception handling support $SIG{__DIE__} = sub { my ($err) = @_; $err =~ s|\r?\n$||s;