diff options
author | Tobi Oetiker <tobi@oetiker.ch> | 2007-12-13 21:46:27 +0100 |
---|---|---|
committer | Tobi Oetiker <tobi@oetiker.ch> | 2007-12-13 21:46:27 +0100 |
commit | 68ea224e043c83de1d185cb6fa329997a34ec74d (patch) | |
tree | 2afc39b1abcec5c1d6f0fbc54e72428e225151da | |
parent | 1f7c876a44f4bcb28affa098c283979b2bc08f32 (diff) | |
download | smokeping-68ea224e043c83de1d185cb6fa329997a34ec74d.tar.gz smokeping-68ea224e043c83de1d185cb6fa329997a34ec74d.tar.xz |
working towards fixing the master config
-rw-r--r-- | CHANGES | 5 | ||||
-rw-r--r-- | lib/Smokeping/Master.pm | 5 | ||||
-rw-r--r-- | qooxdoo/Makefile | 1 |
3 files changed, 9 insertions, 2 deletions
@@ -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 |