Testing static generation

lib/Munin/Master/Graph.pm

@@ -217,6 +217,8 @@ sub handle_request
 
 	DEBUG "found node=$id, type=$type";
 
+	my $dbdir = get_param("dbdir");
+
 	# Here's the most common case: only plain plugins
 	my $sth;
 
@@ -453,6 +455,8 @@ sub handle_request
 			($_rrdfile, $_rrdfield, $_lastupdated) = get_alias_rrdfile($dbh, $_rrdalias);
 		}
 
+		$_rrdfile = File::Spec->catfile($dbdir, $_rrdfile);
+
 		# Fetch the data from the RRDs
 		my $rrd_is_virtual = is_virtual($_rrdname, $_rrdcdef);
 		my $rrd_is_cdef = defined $_rrdcdef && $_rrdcdef ne "";
@@ -987,4 +991,16 @@ sub get_alias_rrdfile
 	return ($_rrdfile, $_rrdfield, $_lastupdated);
 }
 
+sub get_param
+{
+	my ($param) = @_;
+
+	# Ok, now SQL is needed to go further
+        use DBI;
+	my $datafilename = $ENV{MUNIN_DBURL} || "$Munin::Common::Defaults::MUNIN_DBDIR/datafile.sqlite";
+	my $dbh = Munin::Master::Update::get_dbh(1);
+	my ($value) = $dbh->selectrow_array("SELECT value FROM param WHERE name = ?", undef, ($param));
+	return $value;
+}
+
 1;

lib/Munin/Master/HTML.pm

@@ -569,8 +569,9 @@ RENDERING:
 		print $cgi->header( "-Content-Type" => "text/html",
 			-Cache_Control => "public, max-age=3600", # 1h for HTML pages
 		);
+		my $tmpldir = get_param("tmpldir");
 		my $template = HTML::Template::Pro->new(
-			filename => "$Munin::Common::Defaults::MUNIN_CONFDIR/templates/$template_filename",
+			filename => "$tmpldir/$template_filename",
 			loop_context_vars => 1,
 		);
 

lib/Munin/Master/Static/CGI.pm

@@ -0,0 +1,40 @@
+package Munin::Master::Static::HTML::CGI;
+
+# empty, it is just to have Perl loading this file to be able to override the
+# standard ::CGI namespace to mock it
+
+package CGI;
+
+sub new {
+        my $c = shift;
+        my $params = shift;
+        return bless $params, $c;
+}
+
+sub path_info {
+	my $self = shift;
+	return $self->{path_info};
+}
+
+sub url_param {
+	my $self = shift;
+	my $param = shift;
+	die("undef") unless defined $param;
+	return $self->{url_param}{$param};
+}
+
+my %header;
+sub header {
+	my $self = shift;
+	%header = @_;
+
+	# No return, so nothing is printed
+	return "";
+}
+
+sub url {
+	my $self = shift;
+	return "";
+}
+
+1;

lib/Munin/Master/Static/Graph.pm

@@ -0,0 +1,73 @@
+package Munin::Master::Static::Graph;
+
+use strict;
+use warnings;
+
+use Getopt::Long;
+use Parallel::ForkManager;
+use File::Basename;
+use File::Path qw(make_path remove_tree);
+
+use Munin::Master::Static::CGI;
+
+use Munin::Master::Graph;
+
+sub create
+{
+	my ($jobs, $destination) = @_;
+
+	# Get the list of png to create
+	my @paths;
+	{
+		use Munin::Master::Update;
+		my $dbh = Munin::Master::Update::get_dbh(1);
+		my $row_ref = $dbh->selectall_arrayref("SELECT path FROM url WHERE type = ?", {}, "service");
+
+		# Process results
+		@paths = map {
+			my $path = @{$_}[0];
+			(
+				"$path-year.png",
+				"$path-month.png",
+				"$path-week.png",
+				"$path-day.png",
+				"$path-hour.png",
+			);
+		} @$row_ref;
+	}
+
+	my $pm = Parallel::ForkManager->new($jobs);
+	for my $path (@paths) {
+		my $worker_id = $pm->start();
+		next if $worker_id;
+
+		# Mock CGI interface, in order to reuse most of munin-httpd internals
+		my $cgi = CGI->new({
+			path_info => "/$path",
+		});
+
+		$destination = $1 if $destination =~ m/(.*)/;
+		my $filepath = "$destination/$path";
+
+		# redirect STDOUT to the file
+		print "s: $filepath\n";
+
+		my $dirpath = dirname($filepath);
+		make_path($dirpath);
+
+		do {
+			local *STDOUT;
+			open (STDOUT, '>', $filepath);
+
+			Munin::Master::Graph::handle_request($cgi);
+		};
+
+		$pm->finish();
+	}
+
+	# wait for every worker to finish
+	$pm->wait_all_children();
+
+}
+
+1;

lib/Munin/Master/Static/HTML.pm

@@ -0,0 +1,67 @@
+package Munin::Master::Static::HTML;
+
+use strict;
+use warnings;
+
+use Getopt::Long;
+use Parallel::ForkManager;
+
+use Munin::Master::Static::CGI;
+
+sub create
+{
+	my ($jobs, $destination) = @_;
+
+	# Get the list of HTML pages to create
+	my @paths;
+	{
+		use Munin::Master::Update;
+		my $dbh = Munin::Master::Update::get_dbh(1);
+		my $row_ref = $dbh->selectall_arrayref("SELECT path FROM url");
+
+		# Process results
+		@paths = map {
+			my $path = @{$_}[0] . ".html";
+		} @$row_ref;
+		push @paths, "/";
+	}
+
+	my $pm = Parallel::ForkManager->new($jobs);
+	for my $path (@paths) {
+		my $worker_id = $pm->start();
+		next if $worker_id;
+
+		# Mock CGI interface, in order to reuse most of munin-httpd internals
+		my $cgi = CGI->new({
+			path_info => $path,
+		});
+
+		$destination = $1 if $destination =~ m/(.*)/;
+		my $filepath = "$destination/$path";
+		$filepath = "$destination/index.html" if $path eq "/";
+
+		# redirect STDOUT to the file
+		print "s: $filepath\n";
+
+		use File::Basename;
+		use File::Path qw(make_path remove_tree);
+
+		my $dirpath = dirname($filepath);
+		make_path($dirpath);
+
+		do {
+			local *STDOUT;
+			open (STDOUT, '>', $filepath);
+
+			use Munin::Master::HTML;
+			Munin::Master::HTML::handle_request($cgi);
+		};
+
+		$pm->finish();
+	}
+
+	# wait for every worker to finish
+	$pm->wait_all_children();
+}
+
+1;

lib/Munin/Master/UpdateWorker.pm

@@ -845,9 +845,6 @@ sub _get_rrd_file_name {
                        $ds_name,
                        $type_id);
 
-    $file = File::Spec->catfile($config->{dbdir},
-				$file);
-
     DEBUG "[DEBUG] rrd filename: $file\n";
 
     return $file;
@@ -859,6 +856,8 @@ sub _create_rrd_file {
 
     INFO "[INFO] creating rrd-file for $service->$ds_name: '$rrd_file'";
 
+    $rrd_file = File::Spec->catfile($config->{dbdir}, $rrd_file);
+
     munin_mkdir_p(dirname($rrd_file), oct(777));
 
     my @args;
@@ -1018,6 +1017,8 @@ sub to_sec {
 sub _update_rrd_file {
 	my ($self, $rrd_file, $ds_name, $ds_values) = @_;
 
+	$rrd_file = File::Spec->catfile($config->{dbdir}, $rrd_file);
+
 	my $values = $ds_values->{value};
 
 	# Some kind of mismatch between fetch and config can cause this.