[Resmon-devel] [resmon commit] Resmon Resource Monitor branch, resmon1, updated. 427f32222a6808eceabbfcb459a387370bcb3d37

git at labs.omniti.com git at labs.omniti.com
Mon Mar 14 16:48:42 EDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Resmon Resource Monitor".

The branch, resmon1 has been updated
       via  427f32222a6808eceabbfcb459a387370bcb3d37 (commit)
      from  c30deda2c905656457c21d266efb3615e05d60cd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 427f32222a6808eceabbfcb459a387370bcb3d37
Author: Mark Harrison <mark at mivok.net>
Date:   Mon Mar 14 16:48:34 2011 -0400

    Remove svn revision checking from resmon1 - we're using git for distribution now

diff --git a/lib/Resmon/Module/RESMON.pm b/lib/Resmon/Module/RESMON.pm
index 49e42af..a8b404b 100644
--- a/lib/Resmon/Module/RESMON.pm
+++ b/lib/Resmon/Module/RESMON.pm
@@ -6,7 +6,7 @@ use vars qw/@ISA/;
 use Sys::Hostname;
 
 # A resmon 'health check' module
-# Currently just prints the hostname and svn revision in the output, always
+# Currently just prints the hostname in the output, always
 # returning OK. In future it will check for a broken config and broken
 # modules, reporting that it is running with old modules/an old config.
 
@@ -21,25 +21,6 @@ sub handler {
     my $configstatus = $config->{'configstatus'} || "";
     my $modstatus = $config->{'modstatus'} || "";
 
-    ## Current revision
-    # Find location of subversion binary
-    my $svn = 'svn';
-    for my $path (qw(/usr/local/bin /opt/omni/bin /opt/csw/bin)) {
-        if (-x "$path/svn") {
-            $svn = "$path/svn";
-            last;
-        }
-    }
-    my $output = cache_command("$svn info $resmon_dir 2>&1", 120);
-    my $revision = "svn revision unknown";
-    for (split(/\n/, $output)) {
-        if (/^Revision:\s*(\d*)$/) { $revision = "r$1"; }
-        if (/^svn: (.*) is not a working copy$/) {
-            $revision = "not a working copy";
-        }
-    }
-
-
     # The hostname command croaks (dies) if it fails, hence the eval
     my $hostname = eval { hostname } || "Unknown";
 
@@ -55,13 +36,12 @@ sub handler {
     }
 
     # Set 'config' variables so it shows up in the xml output
-    $arg->{'revision'} = $revision;
     $arg->{'hostname'} = $hostname;
     $arg->{'configstatus'} = $configstatus || "OK";
     $arg->{'modstatus'} = $modstatus || "OK";
 
     return $status, {
-        "message" => ["$hostname $statusmsg ($revision)", "s"]
+        "message" => ["$hostname $statusmsg", "s"]
     };
 }
 

-----------------------------------------------------------------------

Summary of changes:
 lib/Resmon/Module/RESMON.pm |   24 ++----------------------
 1 files changed, 2 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
Resmon Resource Monitor


More information about the Resmon-devel mailing list