summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTobi Oetiker <tobi@oetiker.ch>2011-09-21 18:18:29 +0200
committerTobi Oetiker <tobi@oetiker.ch>2011-09-21 18:18:29 +0200
commite63c27dac0ca039b67e284235df8238bd0012cfc (patch)
tree94c897987ffc26600dfc28e9c6ea13443e125b65 /lib
parent11d1224adf4208f5122c2e87bb18007e95443490 (diff)
downloadsmokeping-e63c27dac0ca039b67e284235df8238bd0012cfc.tar.gz
smokeping-e63c27dac0ca039b67e284235df8238bd0012cfc.tar.xz
* switch from speedy to fastcgi
* improved installation, no file editing required anymore * update installation instructions
Diffstat (limited to 'lib')
-rw-r--r--lib/Smokeping.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index c725005..293cdba 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -3766,7 +3766,7 @@ sub daemonize_me ($) {
sub load_cfg ($;$) {
my $cfgfile = shift;
my $noinit = shift;
- my $cfmod = (stat $cfgfile)[9] || die "ERROR: calling stat on $cfgfile: $!\n";
+ my $cfmod = (stat $cfgfile)[9] || die "ERROR: loading smokeping configuration file $cfgfile: $!\n";
# when running under speedy this will prevent reloading on every run
# if cfgfile has been modified we will still run.
if (not defined $cfg or not defined $probes # or $cfg->{__last} < $cfmod
@@ -3892,12 +3892,12 @@ ${e}cut
POD
}
-sub cgi ($) {
+sub cgi ($$) {
my $cfgfile = shift;
+ my $q = shift;
$cgimode = 'yes';
umask 022;
load_cfg $cfgfile;
- my $q=new CGI;
initialize_cgilog();
if ($q->param(-name=>'slave')) { # a slave is calling in
Smokeping::Master::answer_slave($cfg,$q);