|
Lines 1-6
Link Here
|
| 1 |
--- lib/Smokeping.pm.orig 2015-02-12 19:31:21.000000000 +0100 |
1 |
--- lib/Smokeping.pm.orig 2014-11-04 22:56:29 UTC |
| 2 |
+++ lib/Smokeping.pm 2015-02-12 19:34:23.000000000 +0100 |
2 |
+++ lib/Smokeping.pm |
| 3 |
@@ -2632,12 +2632,14 @@ |
3 |
@@ -1413,7 +1413,7 @@ sub get_detail ($$$$;$){ |
|
|
4 |
# do_log ("***** end task ***** <br />"); |
| 5 |
|
| 6 |
my $graphret; |
| 7 |
- ($graphret,$xs{$s},$ys{$s}) = RRDs::graph @task; |
| 8 |
+ ($graphret,$xs{$s},$ys{$s}) = RRDs::graph(@task); |
| 9 |
# die "<div>INFO:".join("<br/>",@task)."</div>"; |
| 10 |
my $ERROR = RRDs::error(); |
| 11 |
if ($ERROR) { |
| 12 |
@@ -2632,12 +2632,14 @@ DOC |
| 4 |
{ |
13 |
{ |
| 5 |
%$DIRCHECK_SUB, |
14 |
%$DIRCHECK_SUB, |
| 6 |
_doc => <<DOC, |
15 |
_doc => <<DOC, |
|
Lines 19-25
Link Here
|
| 19 |
DOC |
28 |
DOC |
| 20 |
}, |
29 |
}, |
| 21 |
piddir => |
30 |
piddir => |
| 22 |
@@ -4214,7 +4216,7 @@ |
31 |
@@ -4214,7 +4216,7 @@ sub main (;$) { |
| 23 |
if(defined $opt{'check'}) { verify_cfg($cfgfile); exit 0; } |
32 |
if(defined $opt{'check'}) { verify_cfg($cfgfile); exit 0; } |
| 24 |
if($opt{reload}) { |
33 |
if($opt{reload}) { |
| 25 |
load_cfg $cfgfile, 'noinit'; # we need just the piddir |
34 |
load_cfg $cfgfile, 'noinit'; # we need just the piddir |
|
Lines 28-34
Link Here
|
| 28 |
print "HUP signal sent to the running SmokePing process, exiting.\n"; |
37 |
print "HUP signal sent to the running SmokePing process, exiting.\n"; |
| 29 |
exit 0; |
38 |
exit 0; |
| 30 |
}; |
39 |
}; |
| 31 |
@@ -4223,7 +4225,7 @@ |
40 |
@@ -4223,7 +4225,7 @@ sub main (;$) { |
| 32 |
if(defined $opt{'static-pages'}) { makestaticpages $cfg, $opt{'static-pages'}; exit 0 }; |
41 |
if(defined $opt{'static-pages'}) { makestaticpages $cfg, $opt{'static-pages'}; exit 0 }; |
| 33 |
if($opt{email}) { enable_dynamic $cfg, $cfg->{Targets},"",""; exit 0 }; |
42 |
if($opt{email}) { enable_dynamic $cfg, $cfg->{Targets},"",""; exit 0 }; |
| 34 |
} |
43 |
} |
|
Lines 37-43
Link Here
|
| 37 |
|
46 |
|
| 38 |
if($opt{logfile}) { initialize_filelog($opt{logfile}) }; |
47 |
if($opt{logfile}) { initialize_filelog($opt{logfile}) }; |
| 39 |
|
48 |
|
| 40 |
@@ -4236,7 +4238,7 @@ |
49 |
@@ -4236,7 +4238,7 @@ sub main (;$) { |
| 41 |
initialize_syslog($cfg->{General}{syslogfacility}, |
50 |
initialize_syslog($cfg->{General}{syslogfacility}, |
| 42 |
$cfg->{General}{syslogpriority}); |
51 |
$cfg->{General}{syslogpriority}); |
| 43 |
} |
52 |
} |
|
Lines 46-52
Link Here
|
| 46 |
} |
55 |
} |
| 47 |
do_log "Smokeping version $VERSION successfully launched."; |
56 |
do_log "Smokeping version $VERSION successfully launched."; |
| 48 |
|
57 |
|
| 49 |
@@ -4413,7 +4415,7 @@ |
58 |
@@ -4413,7 +4415,7 @@ KID: |
| 50 |
my $new_conf = Smokeping::Slave::submit_results $slave_cfg,$cfg,$myprobe,$probes; |
59 |
my $new_conf = Smokeping::Slave::submit_results $slave_cfg,$cfg,$myprobe,$probes; |
| 51 |
if ($new_conf && !$gothup){ |
60 |
if ($new_conf && !$gothup){ |
| 52 |
do_log('server has new config for me ... HUPing the parent'); |
61 |
do_log('server has new config for me ... HUPing the parent'); |