summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--lib/Smokeping/Master.pm5
-rw-r--r--qooxdoo/Makefile1
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 85a190f..0feb6f5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,12 @@
+* fix file locking for solaris in master/slave setups. work in progress. -- tobi
+
* EchoPingHttp: add the 'accept_redirects' option, suggested by
Kelly Shutt <kelly *websitesource.com> --niko
+
* remove a leftover 'use HTTP::Request' from Smokeping::Master -- niko
+
* document the LWP dependency of the Smokeping::Slave module -- niko
+
* fix restart behaviour of clients in multiprocess mode. now we just send
ourself a SIGHUP and let 'it' happen -- tobi
diff --git a/lib/Smokeping/Master.pm b/lib/Smokeping/Master.pm
index 590e75e..efe1d9a 100644
--- a/lib/Smokeping/Master.pm
+++ b/lib/Smokeping/Master.pm
@@ -100,7 +100,10 @@ sub save_updates {
my ($name, $time, $updatestring) = split /\t/, $update;
my $file = $cfg->{General}{datadir}."/${name}.slave_cache";
if ( ! -f $cfg->{General}{datadir}."/${name}.rrd" ){
- warn "Skipping update for ${name}.slave_cache since $cfg->{General}{datadir}/${name}.rrd does not exist in the local data structure. Make sure you run the smokeping daemon. ($cfg->{General}{datadir})\n";
+ warn "Skipping update for ${name}.slave_cache since ".
+ "$cfg->{General}{datadir}/${name}.rrd does not exist ".
+ " in the local data structure. Make sure you run the ".
+ "smokeping daemon. ($cfg->{General}{datadir})\n";
}
elsif ( open (my $hand, '+<', $file) ) {
for (my $i = 10; $i < 0; $i--){
diff --git a/qooxdoo/Makefile b/qooxdoo/Makefile
index 8a296c2..16598db 100644
--- a/qooxdoo/Makefile
+++ b/qooxdoo/Makefile
@@ -82,7 +82,6 @@ APPLICATION_THEME_ICON = qx.theme.icon.CrystalClear
################################################################################
# INTERNALS (PLEASE DO NOT CHANGE)
################################################################################
-
ifneq ($(QOOXDOO_PATH),PLEASE_DEFINE_QOOXDOO_PATH)
include $(QOOXDOO_PATH)/frontend/framework/tool/make/targets.mk
# include $(QOOXDOO_PATH)/frontend/framework/tool/make/application.mk