Changeset 1292

Timestamp:

08/26/07 19:48:36 (4 years ago)

Author:

jo

Message:

Moved mkdir_p from munin-update to Munin.pm.

Files:

• people/jo/multilevel-groups/server/Munin.pm.in (modified) (2 diffs)
• people/jo/multilevel-groups/server/munin-update.in (modified) (2 diffs)

people/jo/multilevel-groups/server/Munin.pm.in

@@ -59 +59 @@
-           'munin_set_var_loc',
-           'munin_copy_node_toloc',
-
+
+
-           );
-
@@ -1162 +1163 @@
-}
-
+# munin_mkdir_p: Make directory (and path to it)
+# Parameters:
+# - $dirname: Directory to create
+# - $umask: Umask (in addition to the user umask)
+# Returns:
+# - Success: $dirname
+# - Failure: undef
+sub munin_mkdir_p
+{
+    my $dirname = shift;
+    my $umask   = shift;
+
+    return $dirname if (-e $dirname);
+
+    (my $prev = $dirname) =~ s/\/[^\/]+$//;
+    if (mkdir_p ($prev, $umask)) {
+        if (mkdir ($dirname, $umask)) {
+            return $dirname;
+        } else {
+            return undef;
+        }
+    } else {
+        return undef;
+    }
+}
+
-
-1;

people/jo/multilevel-groups/server/munin-update.in

@@ -979 +979 @@
-            if (! -f "$fname") {
-                logger ("creating rrd-file for $servname->$field: \"$fname\"");
-
+unin_m
-                my @args = ("$fname",
-                        "DS:42:".munin_get($fhash, "type", "GAUGE").":600:".
@@ -1160 +1160 @@
-}
-
-sub mkdir_p 
-{
-    my $dirname = shift;
-    my $umask   = shift;
-
-    return $dirname if (-e $dirname);
-
-    (my $prev = $dirname) =~ s/\/[^\/]+$//;
-    if (mkdir_p ($prev, $umask)) {
-        if (mkdir ($dirname, $umask)) {
-            return $dirname;
-        } else {
-            return undef;
-        }
-    } else {
-        return undef;
-    }
-}
-
-1;
-