Removed debug statements

[clearscm.git] / bin / tunnel.pl

diff --git a/bin/tunnel.pl b/bin/tunnel.pl
index 56be859..9472e88 100755 (executable)
--- a/bin/tunnel.pl
+++ b/bin/tunnel.pl
@@ -30,22 +30,22 @@ $Date: $
 
 =head1 SYNOPSIS
 
- Usage: tunnel.pl [-u|sage] [-h|elp] [-ve|rbose] [-d|ebug]
- 
- Where:
-
- -u|sage:      Displays this usage
- -h|elp:       Display full help
- -ve|rbose:    Be verbose
- -d|ebug:      Output debug messages
- -host1:       First host for tunnel (Default: localhost)
- -port1:       Port for host1
- -host2:       Second host for tunnel (Default: defaria.com)
- -port2:       Port for host2
- -a|nnounce:   Whether to announce startup (Default false)
- -maxtretries: Maximum number of retry attempt to reestablish tunnel
-               (Default 3)
- -nodaemon:    Whether to go into daemon mode (Default: Daemon mode)
+  Usage: tunnel.pl [-u|sage] [-h|elp] [-ve|rbose] [-d|ebug]
+
+  Where:
+    -u|sage:      Displays this usage
+    -h|elp:       Display full help
+    -ve|rbose:    Be verbose
+    -d|ebug:      Output debug messages
+    -host1:       First host for tunnel (Default: localhost)
+    -port1:       Port for host1
+    -host2:       Second host for tunnel (Default: defaria.com)
+    -port2:       Port for host2
+    -a|nnounce:   Whether to announce startup (Default false)
+    -ap|pend      Append to logfile (Default: Noappend)
+    -maxtretries: Maximum number of retry attempt to reestablish tunnel
+                  (Default 3)
+    -nodaemon:    Whether to go into daemon mode (Default: Daemon mode)
 
 =head1 DESCRIPTION
 
@@ -68,6 +68,7 @@ use Pod::Usage;
 
 use Display;
 use Logger;
+use Speak;
 use Utils;
 
 my $VERSION  = '$Revision: 1.0 $';
@@ -89,27 +90,10 @@ my %opts = (
 
 my ($log, $ssh);
 
-sub Say($) {
-  my ($msg) = @_;
-
-  if (-f "$FindBin::Bin/shh") {
-    $log->msg("Not speaking because we were asked to be quiet - $msg");
-
-    return;
-  } # if
-
-  my ($status, @output) = Execute "/usr/local/bin/gt \"$msg\"";
-
-  $log->err("Unable to speak (Status: $status) - "
-          . join ("\n", @output), $status) if $status;
-
-  return;
-} # Say
-
 sub Report ($;$) {
   my ($msg, $err) = @_;
 
-  Say $msg;
+  speak $msg, $log;
 
   if ($err) {
     $log->err($msg, $err);
@@ -157,7 +141,7 @@ RETRY:
     my $msg  = 'Ssh tunnel ';
        $msg .= $retryattempts ? 'reestablished' : 'established';
 
-    Say $msg if $opts{announce};
+    speak $msg, $log if $opts{announce};
 
     $log->msg($msg);
 
@@ -196,6 +180,7 @@ GetOptions (
   'announce!',
   'maxretries=i',
   'daemon!',
+  'append',
 ) || Usage;
 
 # Turn off daemon mode if we are in the Perl debugger;
@@ -204,16 +189,21 @@ $opts{daemon} = 0 if defined $DB::OUT;
 use warnings;
 
 $log = Logger->new(
-  path        => '/var/log',
+  path        => '/var/local/log',
   name        => "$Logger::me",
   timestamped => 'yes',
-  append      => 'yes',
+  append      => $opts{append},
 );
 
 $log->msg("$FindBin::Script v$VERSION");
 
 $SIG{INT} = $SIG{TERM} = \&interrupt;
 
-EnterDaemonMode if $opts{daemon};
+if ($opts{daemon}) {
+  # Perl complains if we reference $DB::OUT only once
+  no warnings;
+  EnterDaemonMode unless defined $DB::OUT or get_debug;
+  use warnings;
+} # if
 
 tunnel;