Changeset 1253 for people/janl

Timestamp:

11/18/06 01:10:57 (5 years ago)

Author:

janl

Message:

Indenting and playing with Eclipse

Files:

• people/janl/src/libperl/Munin.pm (modified) (8 diffs)

people/janl/src/libperl/Munin.pm

@@ -1 +1 @@
-package Munin;
+
-#
-# Copyright (C) 2003-2006 Jimmy Olsen, Audun Ytterdal, Nicolai Langfeldt
@@ -18 +19 @@
-#
-# $Id$
-
-use strict;
-use Exporter;
-
-use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION $CONFDIR $DEBUG @legalfetch
-
-
-
-
+
+
-@EXPORT = qw(munin_createlock
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-use RRDs;
-use Fcntl qw(:DEFAULT :flock);
-use IO::Handle;
-use Symbol 'gensym';
-
-
+
-my $config = undef;
-
-
-
-
-
-
+
+
+
-@legalconfig = qw(
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-# Fields to copy when "aliasing" a field
-   = ("label", "draw", "type", "rrdfile", "fieldname", "info"
+= ( "label", "draw", "type", "rrdfile", "fieldname", "info" 
-
-# Make configuration settings available at runtime.
-              
-    
-                = '@@CONFDIR@@';
+
+
+= '@@CONFDIR@@'; 
-print "CONFDIR: $CONFDIR!\n";
-   
-              
-    
-             
-   
-              
-    
-              
-    
-             
-   
-              
-    
-               
-     
-           = '@@PLUGSTATE@@';
- = $PLUGSTATE;  
-              
-    
-              
-    
-            = '@@STATEDIR@@';
-  = $STATEDIR; 
-                = '@@USER@@';
-      = $USER;
-               = '@@GROUP@@';
-     = $GROUP;
-          = '@@PLUGINUSER@@';
-   
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+= '@@PLUGSTATE@@';   
+= $PLUGSTATE;
+
+
+
+
+= '@@STATEDIR@@';         
+= $STATEDIR;
+= '@@USER@@';             
+= $USER;   
+= '@@GROUP@@';            
+= $GROUP;  
+= '@@PLUGINUSER@@';       
+
-$ENV{'MUNIN_VERSION'}    = $VERSION;
-                
-      
-             
-   
-              
-    
-                
-      
-              
-    
-              
-    
-            
-  
-              
-    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-sub munin_createlock {
+
-    # Create lock file, fail and die if not possible.
-    my ($lockname) = @_;
-sysopen (LOCK,$lockname,O_WRONLY | O_CREAT | O_EXCL)
-       
-       print LOCK $$;
-       
-       
+ sysopen( LOCK, $lockname, O_WRONLY | O_CREAT | O_EXCL ) 
+        
+        print LOCK $$;   
+        
+        
-    } else {
-       
+        
-    }
-}
-
-
-sub munin_removelock {
+
-    # Remove lock or die trying.
-    my ($lockname) = @_;
-
-
-
+
+
-}
-
-sub munin_runlock {
+
+    # Simple get lock: Get lock or die trying
-    my ($lockname) = @_;
-&munin_getlock($lockname)
-       
-       exit 0
+ &munin_getlock($lockname) 
+        
+        exit 1
-    }
-    return 1;
@@ -149 +141 @@
-
-sub munin_getlock {
+
+    # Complicated get lock: Try getting it, if it's taken see if the
+    # invoking process is still alive.
-    my ($lockname) = @_;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return 1;
-
-
+
-
-sub munin_delete {
-    # Delete a domain, and corresponding set of nodes from config tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return ($data);
-}
-
-
-sub munin_overwrite {
-$configfile,$overwrite
-keys %$overwrite
-       if (ref $overwrite->{$key}
-           &munin_overwrite($overwrite->{$key},$configfile->{$key}
-       
-       
+ $configfile, $overwrite 
+ keys %$overwrite 
+        if ( ref $overwrite->{$key} 
+            &munin_overwrite( $overwrite->{$key}, $configfile->{$key} 
+        
+        
-    }
-    return ($configfile);
-}
-
-
-sub munin_get_picture_filename {
@@ -215 +209 @@
-
-    # Sanitise
-
-
-
+    
+ 
+   
-    $service =~ s/[^\w_\/"'\[\]\(\)+=-]/_/g;
-
-
-
-
+
+
+
-    } else {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-sub munin_get_filename {
-        my ($config,$domain,$node,$service,$field) = @_;
-
-        return ($config->{'dbdir'} . "/$domain/$node-$service-$field-".
-                lc substr (($config->{domain}->{$domain}->{node}->{$node}->{client}->{$service}->{$field.".type"}||"GAUGE"), 0,1). ".rrd");
-}
-
-
-sub munin_get_bool {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    return undef unless defined $field;
-
-my $ans = &munin_get ($conf, $field, $default, $domain, $node, $service, $plot
+
+  &munin_get( $conf, $field, $default, $domain, $node, $service, $plot 
-    return undef if not defined $ans;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-       
-
-
-
-
-
-field   
-my $default  = shift;
-
-if (!defined $field) {
-       if (!defined $default)
-           return 0
-
-
-
-}
-
-if ($field =~ /^yes$/i or
-$field =~ /^true$/i or
-    $field =~ /^on$/i or
-$field =~ /^enable$/i or
-    $field =~ /^enabled$/i) {
-
-} elsif ($field =~ /^no$/i or
-$field =~ /^false$/i or
-$field =~ /^off$/i or
-$field =~ /^disable$/i or
-    $field =~ /^disabled$/i) 
-       
-$field !~ /\D/
-       
+        
+
+ ## end sub munin_get_bool
+
+ {
+
+default
+if ( !defined $field ) {
+
+        return 0;
+        } else
+            return $default
+
+
+
+    or $field =~ /^true$/i
+
+    or $field =~ /^enable$/i
+or $field =~ /^enabled$/i )
+{
+return 1;
+} elsif (
+
+    or $field =~ /^false$/i
+or $field =~ /^off$/i
+or $field =~ /^disable$/i
+or $field =~ /^disabled$/i )
+
+        
+ $field !~ /\D/ 
+        
-    } else {
-       
-
-
+        
+
+ ## end sub munin_get_bool_val
-
-sub munin_get {
@@ -307 +308 @@
-    # "recurse" upwards.  This allows defaulting at shalow levels and
-    # specific overrides at deeper levels.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-sub munin_node_status {
-$config, $limits, $domain, $node, $check_draw
+ $config, $limits, $domain, $node, $check_draw 
-    my $state = "ok";
-
-    return undef unless defined $config->{domain}->{$domain}->{node}->{$node};
-    my $snode = $config->{domain}->{$domain}->{node}->{$node};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return $state;
-
-
+
-
-sub munin_category_status {
-$config, $limits, $domain, $node, $category, $check_draw
+ $config, $limits, $domain, $node, $category, $check_draw 
-    my $state = "ok";
-
-    return undef unless defined $config->{domain}->{$domain}->{node}->{$node};
-    my $snode = $config->{domain}->{$domain}->{node}->{$node};
-
-foreach my $service (keys %{$snode->{client}}) {
-
-
-
-
-
-
-
-
-
-
-
-
-           if ($fres eq "critical"
-
-               last
-
-
-
-       
-
-
+
+    next
+
+
+
+
+
+
+
+
+
+
+
+
+        if ( defined $fres 
+
+                $state = $fres
+
+
+
+            
+    
+
-    return $state;
-
-
+
-
-sub munin_service_status {
-$config, $limits, $domain, $node, $service, $check_draw
+ $config, $limits, $domain, $node, $service, $check_draw 
-    my $state = "ok";
-
-    return undef
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return $state;
-
-
+
-
-sub munin_field_status {
+
-    # Something to do with warning and critical levels.
-
-    # Appears to not set warning/critical state if "nagios" is turned
-    # off.  Isn't that a bit odd?
-
-
+
-    my $state = undef;
-
-    # Return undef if nagios is turned off, or the field doesn't have any limits
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    my @fields = ();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return $ret;
-
-
-
-
+
+
+
-    my $node    = shift;
-    my $config  = shift;
@@ -518 +552 @@
-    my $order   = shift;
-    my $result  = 0;
-
-    for my $field (@$order) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return $result;
-
-
-
-
+
+
+
-    my $node    = shift;
-    my $config  = shift;
@@ -547 +586 @@
-    my $service = shift;
-    my $result  = [];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return $result;
-
+ ## end sub munin_get_field_order
-
-sub munin_get_rrd_filename {
@@ -582 +617 @@
-    my $path    = shift;
-    my $result  = "unknown";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return $result;
-
-
-
+
-1;
-