complain properly when the secrets file can not be read

2 files changed, 8 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index c65cc91..6ed1360 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+* the 'ralf' fix for cgi which is not able to read the secrets file. -- tobi
+
 * display "all the smoke" even when it gets cut at the top end of the graph
   --tobi
 
diff --git a/lib/Smokeping/Master.pm b/lib/Smokeping/Master.pm
index f8704a0..9a78a31 100644
--- a/lib/Smokeping/Master.pm
+++ b/lib/Smokeping/Master.pm
@@ -210,8 +210,11 @@ sub get_secret {
             close $hand;
             return $1;
         }
-    } 
-    warn "WARNING: Opening $cfg->{Slaves}{secrets}: $!\n";    
+    } else { 
+        print "Content-Type: text/plain\n\n";
+        print "WARNING: Opening secrets file $cfg->{Slaves}{secrets}: $!\n";
+        return '__HORRIBLE_INLINE_SIGNALING__';
+    }
     return;
 }
 
@@ -227,6 +230,7 @@ sub answer_slave {
     my $q = shift;
     my $slave = $q->param('slave');
     my $secret = get_secret($cfg,$slave);
+    return if $secret eq '__HORRIBLE_INLINE_SIGNALING__';
     if (not $secret){
         print "Content-Type: text/plain\n\n";
         print "WARNING: No secret found for slave ${slave}\n";