From a171053ab3626c69315c4a4d7966dd7aa2799df5 Mon Sep 17 00:00:00 2001
From: Sitaram Chamarty <sitaram@atc.tcs.com>
Date: Sun, 17 Jun 2012 07:55:12 +0530
Subject: [PATCH] (minor) improve SNR of some error messages :)

---
 src/lib/Gitolite/Common.pm | 11 ++++++-----
 src/lib/Gitolite/Setup.pm  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/lib/Gitolite/Common.pm b/src/lib/Gitolite/Common.pm
index 638b122..03008b3 100644
--- a/src/lib/Gitolite/Common.pm
+++ b/src/lib/Gitolite/Common.pm
@@ -251,17 +251,18 @@ sub gl_log {
     my $tid = $ENV{GL_TID} ||= $$;
 
     my $fh;
-    logger_plus_stderr( "$ts no GL_LOGFILE env var", "$ts $msg" ) if not $ENV{GL_LOGFILE};
-    open my $lfh, ">>", $ENV{GL_LOGFILE} or logger_plus_stderr( "open log failed: $!", $msg );
+    logger_plus_stderr( "errors found before logging could be setup", "$msg" ) if not $ENV{GL_LOGFILE};
+    open my $lfh, ">>", $ENV{GL_LOGFILE}
+      or logger_plus_stderr( "errors found before logfile could be created", "$msg" );
     print $lfh "$ts\t$tid\t$msg\n";
     close $lfh;
 }
 
 sub logger_plus_stderr {
     open my $fh, "|-", "logger" or confess "it's really not my day is it...?\n";
-    for ( "FATAL: have errors but logging failed!\n", @_ ) {
-        print STDERR "$_\n";
-        print $fh "$_\n";
+    for ( @_ ) {
+        print STDERR "FATAL: $_\n";
+        print $fh "FATAL: $_\n";
     }
     exit 1;
 }
diff --git a/src/lib/Gitolite/Setup.pm b/src/lib/Gitolite/Setup.pm
index 72d3452..69a1173 100644
--- a/src/lib/Gitolite/Setup.pm
+++ b/src/lib/Gitolite/Setup.pm
@@ -104,7 +104,7 @@ sub setup_glrc {
 
 sub setup_gladmin {
     my ( $admin, $pubkey, $argv ) = @_;
-    _die "no existing conf file found, '-pk' or '-a' required"
+    _die "'-pk' or '-a' required; see 'gitolite setup -h' for more"
       if not $admin and not -f "$rc{GL_ADMIN_BASE}/conf/gitolite.conf";
 
     # reminder: 'admin files' are in ~/.gitolite, 'admin repo' is